From 4caf18bfe4936fc8be66398d8bb81b7dfd13f2b3 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 12 Jul 2017 10:12:25 +0200 Subject: [PATCH] Do not remove test case sources in glibc-rh1469536.patch Removing it from the Makefile is sufficient. This avoids conflicts. --- glibc-rh1469536.patch | 134 ------------------------------------------ 1 file changed, 134 deletions(-) diff --git a/glibc-rh1469536.patch b/glibc-rh1469536.patch index d1c97a1..72e429f 100644 --- a/glibc-rh1469536.patch +++ b/glibc-rh1469536.patch @@ -92,137 +92,3 @@ index 88079fc..7caf101 100644 }; -diff --git a/sysdeps/unix/sysv/linux/s390/tst-ptrace-singleblock.c b/sysdeps/unix/sysv/linux/s390/tst-ptrace-singleblock.c -deleted file mode 100644 -index 95a2f55..0000000 ---- a/sysdeps/unix/sysv/linux/s390/tst-ptrace-singleblock.c -+++ /dev/null -@@ -1,128 +0,0 @@ --/* Testing s390x PTRACE_SINGLEBLOCK ptrace request. -- Copyright (C) 2017 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -- -- The GNU C Library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, see -- . */ -- --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -- --/* Ensure that we use the PTRACE_SINGLEBLOCK definition from glibc ptrace.h -- in tracer_func. We need the kernel ptrace.h for structs ptrace_area -- and gregset_t. */ --#include --static const enum __ptrace_request req_singleblock = PTRACE_SINGLEBLOCK; --#include -- --static void --tracee_func (int pid) --{ -- /* Dump the mapping information for manual inspection of the printed -- tracee addresses. */ -- char str[80]; -- sprintf (str, "cat /proc/%d/maps", pid); -- puts (str); -- system (str); -- fflush (stdout); -- -- TEST_VERIFY_EXIT (ptrace (PTRACE_TRACEME) == 0); -- /* Stop tracee. Afterwards the tracer_func can operate. */ -- kill (pid, SIGSTOP); -- -- puts ("The PTRACE_SINGLEBLOCK of the tracer will stop after: " -- "brasl %r14,!"); --} -- --static void --tracer_func (int pid) --{ -- unsigned long last_break; -- ptrace_area parea; -- gregset_t regs; -- struct iovec parea2; -- gregset_t regs2; -- -- int status; -- -- while (1) -- { -- /* Wait for the tracee to be stopped or exited. */ -- wait (&status); -- if (WIFEXITED (status)) -- break; -- -- /* Get information about tracee: gprs, last breaking address. */ -- parea.len = sizeof (regs); -- parea.process_addr = (unsigned long) ®s; -- parea.kernel_addr = 0; -- TEST_VERIFY_EXIT (ptrace (PTRACE_PEEKUSR_AREA, pid, &parea) == 0); -- TEST_VERIFY_EXIT (ptrace (PTRACE_GET_LAST_BREAK, pid, NULL, &last_break) -- == 0); -- -- parea2.iov_len = sizeof (regs2); -- parea2.iov_base = ®s2; -- TEST_VERIFY_EXIT (ptrace (PTRACE_GETREGSET, pid, NT_PRSTATUS, &parea2) -- == 0); -- TEST_VERIFY_EXIT (parea2.iov_len == sizeof (regs2)); -- -- /* Test if gprs obtained by PTRACE_PEEKUSR_AREA and PTRACE_GETREGESET -- have the same values. */ -- TEST_VERIFY_EXIT (memcmp (®s, ®s2, sizeof (regs)) == 0); -- -- printf ("child IA: %p last_break: %p\n", -- (void *) regs[1], (void *) last_break); -- -- /* Execute tracee until next taken branch. -- -- Note: -- Before the commit which introduced this testcase, -- /sysdeps/unix/sysv/linux/s390/sys/ptrace.h -- uses ptrace-request 12 for PTRACE_GETREGS, -- but /include/uapi/linux/ptrace.h -- uses 12 for PTRACE_SINGLEBLOCK. -- -- The s390 kernel has no support for PTRACE_GETREGS! -- Thus glibc ptrace.h is adjusted to match kernel ptrace.h. -- -- This test ensures, that PTRACE_SINGLEBLOCK defined in glibc -- works as expected. If the kernel would interpret it as -- PTRACE_GETREGS, then the tracee will not make any progress -- and this testcase will time out. */ -- TEST_VERIFY_EXIT (ptrace (req_singleblock, pid, NULL, NULL) == 0); -- } --} -- --static int --do_test (void) --{ -- int pid; -- pid = xfork (); -- if (pid) -- tracer_func (pid); -- else -- tracee_func (getpid ()); -- -- return EXIT_SUCCESS; --} -- --#include