Module Name: src
Committed By: kamil
Date: Fri Dec 2 05:54:15 UTC 2016
Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/kernel: Makefile
Added Files:
src/tests/kernel/arch: Makefile Makefile.inc
src/tests/kernel/arch/amd64: Makefile Makefile.inc t_ptrace_wait.c
t_ptrace_wait3.c t_ptrace_wait4.c t_ptrace_wait6.c
t_ptrace_waitid.c t_ptrace_waitpid.c
Removed Files:
src/tests/kernel: t_ptrace_amd64_wait.c t_ptrace_amd64_wait3.c
t_ptrace_amd64_wait4.c t_ptrace_amd64_wait6.c
t_ptrace_amd64_waitid.c t_ptrace_amd64_waitpid.c
Log Message:
Refactor location of amd64-specific ATF tests to new dir kernel/arch/amd64
Rename
- tests/kernel/t_ptrace_amd64_wait.c
to
- tests/kernel/arch/amd64/t_ptrace_wait.c
and adapt appropriate files accordingly.
New directory will be used for more amd64-specific tests, verifying the
MD parts of the kernel.
Remove old entries from distrib/sets/lists as they were added a while ago.
Sponsored by <The NetBSD Foundation>
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.705 -r1.706 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.135 -r1.136 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.42 -r1.43 src/tests/kernel/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/kernel/t_ptrace_amd64_wait.c \
src/tests/kernel/t_ptrace_amd64_wait3.c \
src/tests/kernel/t_ptrace_amd64_wait4.c \
src/tests/kernel/t_ptrace_amd64_wait6.c \
src/tests/kernel/t_ptrace_amd64_waitid.c \
src/tests/kernel/t_ptrace_amd64_waitpid.c
cvs rdiff -u -r0 -r1.1 src/tests/kernel/arch/Makefile \
src/tests/kernel/arch/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/tests/kernel/arch/amd64/Makefile \
src/tests/kernel/arch/amd64/Makefile.inc \
src/tests/kernel/arch/amd64/t_ptrace_wait.c \
src/tests/kernel/arch/amd64/t_ptrace_wait3.c \
src/tests/kernel/arch/amd64/t_ptrace_wait4.c \
src/tests/kernel/arch/amd64/t_ptrace_wait6.c \
src/tests/kernel/arch/amd64/t_ptrace_waitid.c \
src/tests/kernel/arch/amd64/t_ptrace_waitpid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.182 src/distrib/sets/lists/debug/mi:1.183
--- src/distrib/sets/lists/debug/mi:1.182 Fri Dec 2 00:50:09 2016
+++ src/distrib/sets/lists/debug/mi Fri Dec 2 05:54:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.182 2016/12/02 00:50:09 kamil Exp $
+# $NetBSD: mi,v 1.183 2016/12/02 05:54:14 kamil Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1659,6 +1659,12 @@
./usr/libdata/debug/usr/tests/include/t_paths.debug tests-include-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/include/t_stdint.debug tests-include-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/include/t_types.debug tests-obsolete obsolete,compattestfile
+./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_wait.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
+./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_wait3.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
+./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_wait4.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
+./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_wait6.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
+./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_waitid.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
+./usr/libdata/debug/usr/tests/kernel/arch/amd64/t_ptrace_waitpid.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
./usr/libdata/debug/usr/tests/kernel/h_ps_strings1.debug tests-kernel-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/kernel/h_ps_strings2.debug tests-kernel-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/kernel/kqueue/read/t_fifo.debug tests-kernel-tests debug,atf,compattestfile
@@ -1695,12 +1701,6 @@
./usr/libdata/debug/usr/tests/kernel/t_pollts.debug tests-obsolete obsolete,compattestfile
./usr/libdata/debug/usr/tests/kernel/t_posix_fadvise.debug tests-obsolete obsolete,compattestfile
./usr/libdata/debug/usr/tests/kernel/t_ptrace.debug tests-kernel-tests debug,atf,compattestfile
-./usr/libdata/debug/usr/tests/kernel/t_ptrace_amd64_wait.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
-./usr/libdata/debug/usr/tests/kernel/t_ptrace_amd64_wait3.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
-./usr/libdata/debug/usr/tests/kernel/t_ptrace_amd64_wait4.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
-./usr/libdata/debug/usr/tests/kernel/t_ptrace_amd64_wait6.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
-./usr/libdata/debug/usr/tests/kernel/t_ptrace_amd64_waitid.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
-./usr/libdata/debug/usr/tests/kernel/t_ptrace_amd64_waitpid.debug tests-kernel-tests debug,atf,compattestfile,machine=amd64
./usr/libdata/debug/usr/tests/kernel/t_ptrace_wait.debug tests-kernel-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/kernel/t_ptrace_wait3.debug tests-kernel-tests debug,atf,compattestfile
./usr/libdata/debug/usr/tests/kernel/t_ptrace_wait4.debug tests-kernel-tests debug,atf,compattestfile
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.705 src/distrib/sets/lists/tests/mi:1.706
--- src/distrib/sets/lists/tests/mi:1.705 Fri Dec 2 00:50:09 2016
+++ src/distrib/sets/lists/tests/mi Fri Dec 2 05:54:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.705 2016/12/02 00:50:09 kamil Exp $
+# $NetBSD: mi,v 1.706 2016/12/02 05:54:14 kamil Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -55,6 +55,8 @@
./usr/libdata/debug/usr/tests/include/sys tests-include-tests compattestfile,atf
./usr/libdata/debug/usr/tests/ipf tests-ipf-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel tests-kernel-tests compattestfile,atf
+./usr/libdata/debug/usr/tests/kernel/arch tests-kernel-tests compattestfile,atf
+./usr/libdata/debug/usr/tests/kernel/arch/amd64 tests-kernel-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel/kqueue tests-kernel-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/read tests-kernel-tests compattestfile,atf
./usr/libdata/debug/usr/tests/kernel/kqueue/write tests-kernel-tests compattestfile,atf
@@ -2080,6 +2082,18 @@
./usr/tests/kernel tests-kernel-tests compattestfile,atf
./usr/tests/kernel/Atffile tests-kernel-tests compattestfile,atf
./usr/tests/kernel/Kyuafile tests-kernel-tests compattestfile,atf,kyua
+./usr/tests/kernel/arch tests-kernel-tests compattestfile,atf
+./usr/tests/kernel/arch/Atffile tests-kernel-tests compattestfile,atf
+./usr/tests/kernel/arch/Kyuafile tests-kernel-tests compattestfile,atf,kyua
+./usr/tests/kernel/arch/amd64 tests-kernel-tests compattestfile,atf
+./usr/tests/kernel/arch/amd64/Atffile tests-kernel-tests compattestfile,atf,machine=amd64
+./usr/tests/kernel/arch/amd64/Kyuafile tests-kernel-tests compattestfile,atf,kyua,machine=amd64
+./usr/tests/kernel/arch/amd64/t_ptrace_wait tests-kernel-tests compattestfile,atf,machine=amd64
+./usr/tests/kernel/arch/amd64/t_ptrace_wait3 tests-kernel-tests compattestfile,atf,machine=amd64
+./usr/tests/kernel/arch/amd64/t_ptrace_wait4 tests-kernel-tests compattestfile,atf,machine=amd64
+./usr/tests/kernel/arch/amd64/t_ptrace_wait6 tests-kernel-tests compattestfile,atf,machine=amd64
+./usr/tests/kernel/arch/amd64/t_ptrace_waitid tests-kernel-tests compattestfile,atf,machine=amd64
+./usr/tests/kernel/arch/amd64/t_ptrace_waitpid tests-kernel-tests compattestfile,atf,machine=amd64
./usr/tests/kernel/h_ps_strings1 tests-kernel-tests compattestfile,atf
./usr/tests/kernel/h_ps_strings2 tests-kernel-tests compattestfile,atf
./usr/tests/kernel/kqueue tests-kernel-tests compattestfile,atf
@@ -2131,12 +2145,6 @@
./usr/tests/kernel/t_posix_fallocate tests-obsolete obsolete
./usr/tests/kernel/t_ps_strings tests-kernel-tests compattestfile,atf
./usr/tests/kernel/t_ptrace tests-kernel-tests compattestfile,atf
-./usr/tests/kernel/t_ptrace_amd64_wait tests-kernel-tests compattestfile,atf,machine=amd64
-./usr/tests/kernel/t_ptrace_amd64_wait3 tests-kernel-tests compattestfile,atf,machine=amd64
-./usr/tests/kernel/t_ptrace_amd64_wait4 tests-kernel-tests compattestfile,atf,machine=amd64
-./usr/tests/kernel/t_ptrace_amd64_wait6 tests-kernel-tests compattestfile,atf,machine=amd64
-./usr/tests/kernel/t_ptrace_amd64_waitid tests-kernel-tests compattestfile,atf,machine=amd64
-./usr/tests/kernel/t_ptrace_amd64_waitpid tests-kernel-tests compattestfile,atf,machine=amd64
./usr/tests/kernel/t_ptrace_wait tests-kernel-tests compattestfile,atf
./usr/tests/kernel/t_ptrace_wait3 tests-kernel-tests compattestfile,atf
./usr/tests/kernel/t_ptrace_wait4 tests-kernel-tests compattestfile,atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.135 src/etc/mtree/NetBSD.dist.tests:1.136
--- src/etc/mtree/NetBSD.dist.tests:1.135 Sat Nov 26 03:19:48 2016
+++ src/etc/mtree/NetBSD.dist.tests Fri Dec 2 05:54:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.135 2016/11/26 03:19:48 ozaki-r Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.136 2016/12/02 05:54:14 kamil Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -46,6 +46,8 @@
./usr/libdata/debug/usr/tests/include/sys
./usr/libdata/debug/usr/tests/ipf
./usr/libdata/debug/usr/tests/kernel
+./usr/libdata/debug/usr/tests/kernel/arch
+./usr/libdata/debug/usr/tests/kernel/arch/amd64
./usr/libdata/debug/usr/tests/kernel/kqueue
./usr/libdata/debug/usr/tests/kernel/kqueue/read
./usr/libdata/debug/usr/tests/kernel/kqueue/write
@@ -226,6 +228,8 @@
./usr/tests/ipf/input
./usr/tests/ipf/regress
./usr/tests/kernel
+./usr/tests/kernel/arch
+./usr/tests/kernel/arch/amd64
./usr/tests/kernel/kqueue
./usr/tests/kernel/kqueue/read
./usr/tests/kernel/kqueue/write
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.42 src/tests/kernel/Makefile:1.43
--- src/tests/kernel/Makefile:1.42 Thu Dec 1 20:11:17 2016
+++ src/tests/kernel/Makefile Fri Dec 2 05:54:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2016/12/01 20:11:17 kamil Exp $
+# $NetBSD: Makefile,v 1.43 2016/12/02 05:54:15 kamil Exp $
NOMAN= # defined
@@ -6,7 +6,8 @@ NOMAN= # defined
TESTSDIR= ${TESTSBASE}/kernel
-TESTS_SUBDIRS= kqueue
+TESTS_SUBDIRS= arch
+TESTS_SUBDIRS+= kqueue
TESTS_C= t_lock
TESTS_C+= t_lockf
TESTS_C+= t_ptrace
@@ -23,15 +24,6 @@ TESTS_C+= t_subr_prf
TESTS_C+= t_kauth_pr_47598
TESTS_C+= t_sysctl
-.if (${MACHINE} == "amd64")
-TESTS_C+= t_ptrace_amd64_wait
-TESTS_C+= t_ptrace_amd64_wait3
-TESTS_C+= t_ptrace_amd64_wait4
-TESTS_C+= t_ptrace_amd64_wait6
-TESTS_C+= t_ptrace_amd64_waitid
-TESTS_C+= t_ptrace_amd64_waitpid
-.endif
-
TESTS_SH= t_umount
TESTS_SH+= t_umountstress
TESTS_SH+= t_ps_strings
Added files:
Index: src/tests/kernel/arch/Makefile
diff -u /dev/null src/tests/kernel/arch/Makefile:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/Makefile Fri Dec 2 05:54:15 2016
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2016/12/02 05:54:15 kamil Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/kernel/arch
+
+.if (${MACHINE} == "amd64")
+TESTS_SUBDIRS+= amd64
+.endif
+
+.include <bsd.test.mk>
Index: src/tests/kernel/arch/Makefile.inc
diff -u /dev/null src/tests/kernel/arch/Makefile.inc:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/Makefile.inc Fri Dec 2 05:54:15 2016
@@ -0,0 +1 @@
+.include "../Makefile.inc"
Index: src/tests/kernel/arch/amd64/Makefile
diff -u /dev/null src/tests/kernel/arch/amd64/Makefile:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/Makefile Fri Dec 2 05:54:15 2016
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2016/12/02 05:54:15 kamil Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/kernel/arch/amd64
+
+TESTS_C+= t_ptrace_wait
+TESTS_C+= t_ptrace_wait3
+TESTS_C+= t_ptrace_wait4
+TESTS_C+= t_ptrace_wait6
+TESTS_C+= t_ptrace_waitid
+TESTS_C+= t_ptrace_waitpid
+
+.include <bsd.test.mk>
Index: src/tests/kernel/arch/amd64/Makefile.inc
diff -u /dev/null src/tests/kernel/arch/amd64/Makefile.inc:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/Makefile.inc Fri Dec 2 05:54:15 2016
@@ -0,0 +1 @@
+.include "../Makefile.inc"
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u /dev/null src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Fri Dec 2 05:54:15 2016
@@ -0,0 +1,122 @@
+/* $NetBSD: t_ptrace_wait.c,v 1.1 2016/12/02 05:54:15 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2016 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.1 2016/12/02 05:54:15 kamil Exp $");
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/wait.h>
+#include <machine/reg.h>
+#include <err.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "../../../h_macros.h"
+
+#include "../../t_ptrace_wait.h"
+
+#if defined(HAVE_DBREGS)
+ATF_TC(dbregs1);
+ATF_TC_HEAD(dbregs1, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify plain PT_GETDBREGS with printing Debug Registers");
+}
+
+ATF_TC_BODY(dbregs1, tc)
+{
+ const int exitval = 5;
+ const int sigval = SIGSTOP;
+ pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+ int status;
+#endif
+ struct dbreg r;
+ size_t i;
+
+ printf("Before forking process PID=%d\n", getpid());
+ child = atf_utils_fork();
+ if (child == 0) {
+ printf("Before calling PT_TRACE_ME from child %d\n", getpid());
+ FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+ printf("Before raising %s from child\n", strsignal(sigval));
+ FORKEE_ASSERT(raise(sigval) == 0);
+
+ printf("Before exiting of the child process\n");
+ _exit(exitval);
+ }
+ printf("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+ validate_status_stopped(status, sigval);
+
+ printf("Call GETDBREGS for the child process\n");
+ ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r, 0) != -1);
+
+ printf("State of the debug registers:\n");
+ for (i = 0; i < __arraycount(r.dbregs); i++)
+ printf("r[%zu]=%#lx\n", i, r.dbregs[i]);
+
+ printf("Before resuming the child process where it left off and "
+ "without signal to be sent\n");
+ ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+ validate_status_exited(status, exitval);
+
+ printf("Before calling %s() for the child\n", TWAIT_FNAME);
+ TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
+#endif
+
+ATF_TP_ADD_TCS(tp)
+{
+ setvbuf(stdout, NULL, _IONBF, 0);
+ setvbuf(stderr, NULL, _IONBF, 0);
+
+ ATF_TP_ADD_TC_HAVE_DBREGS(tp, dbregs1);
+
+ return atf_no_error();
+}
Index: src/tests/kernel/arch/amd64/t_ptrace_wait3.c
diff -u /dev/null src/tests/kernel/arch/amd64/t_ptrace_wait3.c:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait3.c Fri Dec 2 05:54:15 2016
@@ -0,0 +1,30 @@
+/* $NetBSD: t_ptrace_wait3.c,v 1.1 2016/12/02 05:54:15 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2016 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.
+ */
+
+#define TWAIT_WAIT3
+#include "t_ptrace_wait.c"
Index: src/tests/kernel/arch/amd64/t_ptrace_wait4.c
diff -u /dev/null src/tests/kernel/arch/amd64/t_ptrace_wait4.c:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait4.c Fri Dec 2 05:54:15 2016
@@ -0,0 +1,30 @@
+/* $NetBSD: t_ptrace_wait4.c,v 1.1 2016/12/02 05:54:15 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2016 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.
+ */
+
+#define TWAIT_WAIT4
+#include "t_ptrace_wait.c"
Index: src/tests/kernel/arch/amd64/t_ptrace_wait6.c
diff -u /dev/null src/tests/kernel/arch/amd64/t_ptrace_wait6.c:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait6.c Fri Dec 2 05:54:15 2016
@@ -0,0 +1,30 @@
+/* $NetBSD: t_ptrace_wait6.c,v 1.1 2016/12/02 05:54:15 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2016 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.
+ */
+
+#define TWAIT_WAIT6
+#include "t_ptrace_wait.c"
Index: src/tests/kernel/arch/amd64/t_ptrace_waitid.c
diff -u /dev/null src/tests/kernel/arch/amd64/t_ptrace_waitid.c:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_waitid.c Fri Dec 2 05:54:15 2016
@@ -0,0 +1,30 @@
+/* $NetBSD: t_ptrace_waitid.c,v 1.1 2016/12/02 05:54:15 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2016 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.
+ */
+
+#define TWAIT_WAITID
+#include "t_ptrace_wait.c"
Index: src/tests/kernel/arch/amd64/t_ptrace_waitpid.c
diff -u /dev/null src/tests/kernel/arch/amd64/t_ptrace_waitpid.c:1.1
--- /dev/null Fri Dec 2 05:54:15 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_waitpid.c Fri Dec 2 05:54:15 2016
@@ -0,0 +1,30 @@
+/* $NetBSD: t_ptrace_waitpid.c,v 1.1 2016/12/02 05:54:15 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2016 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.
+ */
+
+#define TWAIT_WAITPID
+#include "t_ptrace_wait.c"
