Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/lib/libc/sys Move misc tests out of t_ptrace_wait.c to...



details:   https://anonhg.NetBSD.org/src/rev/90e71f0ed903
branches:  trunk
changeset: 971808:90e71f0ed903
user:      kamil <kamil%NetBSD.org@localhost>
date:      Tue May 05 02:06:08 2020 +0000

description:
Move misc tests out of t_ptrace_wait.c to t_ptrace_misc_wait.h

The same tests are now included with the preprocessor in t_ptrace_wait.c.

No functional change intended.

diffstat:

 tests/lib/libc/sys/t_ptrace_misc_wait.h |  118 ++++++++++++++++++++++++++++++++
 tests/lib/libc/sys/t_ptrace_wait.c      |   98 +-------------------------
 2 files changed, 122 insertions(+), 94 deletions(-)

diffs (262 lines):

diff -r 70bfeccfcc71 -r 90e71f0ed903 tests/lib/libc/sys/t_ptrace_misc_wait.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libc/sys/t_ptrace_misc_wait.h   Tue May 05 02:06:08 2020 +0000
@@ -0,0 +1,118 @@
+/*     $NetBSD: t_ptrace_misc_wait.h,v 1.1 2020/05/05 02:06:08 kamil Exp $     */
+
+/*-
+ * Copyright (c) 2016, 2017, 2018, 2019, 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+static void
+user_va0_disable(int operation)
+{
+       pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+       int status;
+#endif
+       const int sigval = SIGSTOP;
+       int rv;
+
+       struct ptrace_siginfo info;
+
+       if (get_user_va0_disable() == 0)
+               atf_tc_skip("vm.user_va0_disable is set to 0");
+
+       memset(&info, 0, sizeof(info));
+
+       DPRINTF("Before forking process PID=%d\n", getpid());
+       SYSCALL_REQUIRE((child = fork()) != -1);
+       if (child == 0) {
+               DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
+               FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+               DPRINTF("Before raising %s from child\n", strsignal(sigval));
+               FORKEE_ASSERT(raise(sigval) == 0);
+
+               /* NOTREACHED */
+               FORKEE_ASSERTX(0 && "This shall not be reached");
+               __unreachable();
+       }
+       DPRINTF("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+       DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+       TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+       validate_status_stopped(status, sigval);
+
+       DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for "
+               "child\n");
+       SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info,
+               sizeof(info)) != -1);
+
+       DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
+       DPRINTF("Signal properties: si_signo=%#x si_code=%#x "
+               "si_errno=%#x\n",
+               info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
+               info.psi_siginfo.si_errno);
+
+       ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval);
+       ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SI_LWP);
+
+       DPRINTF("Before resuming the child process in PC=0x0 "
+           "and without signal to be sent\n");
+       errno = 0;
+       rv = ptrace(operation, child, (void *)0, 0);
+       ATF_REQUIRE_EQ(errno, EINVAL);
+       ATF_REQUIRE_EQ(rv, -1);
+
+       SYSCALL_REQUIRE(ptrace(PT_KILL, child, NULL, 0) != -1);
+
+       DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+       TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+       validate_status_signaled(status, SIGKILL, 0);
+
+       DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+       TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
+
+#define USER_VA0_DISABLE(test, operation)                              \
+ATF_TC(test);                                                          \
+ATF_TC_HEAD(test, tc)                                                  \
+{                                                                      \
+       atf_tc_set_md_var(tc, "descr",                                  \
+           "Verify behavior of " #operation " with PC set to 0x0");    \
+}                                                                      \
+                                                                       \
+ATF_TC_BODY(test, tc)                                                  \
+{                                                                      \
+                                                                       \
+       user_va0_disable(operation);                                    \
+}
+
+USER_VA0_DISABLE(user_va0_disable_pt_continue, PT_CONTINUE)
+USER_VA0_DISABLE(user_va0_disable_pt_syscall, PT_SYSCALL)
+USER_VA0_DISABLE(user_va0_disable_pt_detach, PT_DETACH)
+
+#define ATF_TP_ADD_TCS_PTRACE_WAIT_MISC() \
+       ATF_TP_ADD_TC(tp, user_va0_disable_pt_continue); \
+       ATF_TP_ADD_TC(tp, user_va0_disable_pt_syscall); \
+       ATF_TP_ADD_TC(tp, user_va0_disable_pt_detach);
diff -r 70bfeccfcc71 -r 90e71f0ed903 tests/lib/libc/sys/t_ptrace_wait.c
--- a/tests/lib/libc/sys/t_ptrace_wait.c        Tue May 05 01:28:17 2020 +0000
+++ b/tests/lib/libc/sys/t_ptrace_wait.c        Tue May 05 02:06:08 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_ptrace_wait.c,v 1.190 2020/05/05 01:24:29 kamil Exp $        */
+/*     $NetBSD: t_ptrace_wait.c,v 1.191 2020/05/05 02:06:08 kamil Exp $        */
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.190 2020/05/05 01:24:29 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.191 2020/05/05 02:06:08 kamil Exp $");
 
 #define __LEGACY_PT_LWPINFO
 
@@ -103,94 +103,6 @@
 
 /// ----------------------------------------------------------------------------
 
-static void
-user_va0_disable(int operation)
-{
-       pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
-       int status;
-#endif
-       const int sigval = SIGSTOP;
-       int rv;
-
-       struct ptrace_siginfo info;
-
-       if (get_user_va0_disable() == 0)
-               atf_tc_skip("vm.user_va0_disable is set to 0");
-
-       memset(&info, 0, sizeof(info));
-
-       DPRINTF("Before forking process PID=%d\n", getpid());
-       SYSCALL_REQUIRE((child = fork()) != -1);
-       if (child == 0) {
-               DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
-               FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
-
-               DPRINTF("Before raising %s from child\n", strsignal(sigval));
-               FORKEE_ASSERT(raise(sigval) == 0);
-
-               /* NOTREACHED */
-               FORKEE_ASSERTX(0 && "This shall not be reached");
-               __unreachable();
-       }
-       DPRINTF("Parent process PID=%d, child's PID=%d\n", getpid(), child);
-
-       DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
-       TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
-
-       validate_status_stopped(status, sigval);
-
-       DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for "
-               "child\n");
-       SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info,
-               sizeof(info)) != -1);
-
-       DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
-       DPRINTF("Signal properties: si_signo=%#x si_code=%#x "
-               "si_errno=%#x\n",
-               info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
-               info.psi_siginfo.si_errno);
-
-       ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval);
-       ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SI_LWP);
-
-       DPRINTF("Before resuming the child process in PC=0x0 "
-           "and without signal to be sent\n");
-       errno = 0;
-       rv = ptrace(operation, child, (void *)0, 0);
-       ATF_REQUIRE_EQ(errno, EINVAL);
-       ATF_REQUIRE_EQ(rv, -1);
-
-       SYSCALL_REQUIRE(ptrace(PT_KILL, child, NULL, 0) != -1);
-
-       DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
-       TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
-       validate_status_signaled(status, SIGKILL, 0);
-
-       DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
-       TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
-}
-
-#define USER_VA0_DISABLE(test, operation)                              \
-ATF_TC(test);                                                          \
-ATF_TC_HEAD(test, tc)                                                  \
-{                                                                      \
-       atf_tc_set_md_var(tc, "descr",                                  \
-           "Verify behavior of " #operation " with PC set to 0x0");    \
-}                                                                      \
-                                                                       \
-ATF_TC_BODY(test, tc)                                                  \
-{                                                                      \
-                                                                       \
-       user_va0_disable(operation);                                    \
-}
-
-USER_VA0_DISABLE(user_va0_disable_pt_continue, PT_CONTINUE)
-USER_VA0_DISABLE(user_va0_disable_pt_syscall, PT_SYSCALL)
-USER_VA0_DISABLE(user_va0_disable_pt_detach, PT_DETACH)
-
-/// ----------------------------------------------------------------------------
-
 #include "t_ptrace_register_wait.h"
 #include "t_ptrace_syscall_wait.h"
 #include "t_ptrace_step_wait.h"
@@ -206,6 +118,7 @@
 #include "t_ptrace_threads_wait.h"
 #include "t_ptrace_siginfo_wait.h"
 #include "t_ptrace_core_wait.h"
+#include "t_ptrace_misc_wait.h"
 
 /// ----------------------------------------------------------------------------
 
@@ -236,10 +149,6 @@
        setvbuf(stderr, NULL, _IONBF, 0);
 
 #ifdef ENABLE_TESTS
-       ATF_TP_ADD_TC(tp, user_va0_disable_pt_continue);
-       ATF_TP_ADD_TC(tp, user_va0_disable_pt_syscall);
-       ATF_TP_ADD_TC(tp, user_va0_disable_pt_detach);
-
        ATF_TP_ADD_TCS_PTRACE_WAIT_REGISTER();
        ATF_TP_ADD_TCS_PTRACE_WAIT_SYSCALL();
        ATF_TP_ADD_TCS_PTRACE_WAIT_STEP();
@@ -255,6 +164,7 @@
        ATF_TP_ADD_TCS_PTRACE_WAIT_THREADS();
        ATF_TP_ADD_TCS_PTRACE_WAIT_SIGINFO();
        ATF_TP_ADD_TCS_PTRACE_WAIT_CORE();
+       ATF_TP_ADD_TCS_PTRACE_WAIT_MISC();
 
        ATF_TP_ADD_TCS_PTRACE_WAIT_AMD64();
        ATF_TP_ADD_TCS_PTRACE_WAIT_I386();



Home | Main Index | Thread Index | Old Index