 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.60 2017/01/14 19:17:10 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.61 2017/01/25 17:01:57 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.
 @@ -17,36 +17,37 @@
  * ``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.60 2017/01/14 19:17:10 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.61 2017/01/25 17:01:57 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 <elf.h>
 #include <err.h>
 #include <errno.h>
 #include <lwp.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"
 @@ -2397,26 +2398,92 @@ ATF_TC_BODY(io_write_d4, tc)
 	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));
+}
 ATF_TC(io_read_auxv1);
 ATF_TC_HEAD(io_read_auxv1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_READ_AUXV called for tracee");
+}
 ATF_TC_BODY(io_read_auxv1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	AuxInfo ai[100], *aip;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_READ_AUXV,
 		.piod_offs = 0,
 		.piod_addr = ai,
 		.piod_len = sizeof(ai)
 	};
 	printf("Before forking process PID=%d\n", getpid());
 	ATF_REQUIRE((child = fork()) != -1);
 	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("Read new AUXV from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	printf("Asserting that AUXV length (%zu) is > 0\n", io.piod_len);
 	ATF_REQUIRE(io.piod_len > 0);
 	for (aip = ai; aip->a_type != AT_NULL; aip++)
 		printf("a_type=%#llx a_v=%#llx\n",
 		    (long long int)aip->a_type, (long long int)aip->a_v);
 	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));
+}
 ATF_TC(read_d1);
 ATF_TC_HEAD(read_d1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_READ_D called once");
+}
 ATF_TC_BODY(read_d1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me = 0;
 @@ -5657,26 +5724,28 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, read_d_write_d_handshake1);
 	ATF_TP_ADD_TC(tp, read_d_write_d_handshake2);
 	ATF_TP_ADD_TC(tp, io_read_i1);
 	ATF_TP_ADD_TC(tp, io_read_i2);
 	ATF_TP_ADD_TC(tp, io_read_i3);
 	ATF_TP_ADD_TC(tp, io_read_i4);
 	ATF_TP_ADD_TC(tp, read_i1);
 	ATF_TP_ADD_TC(tp, read_i2);
 	ATF_TP_ADD_TC(tp, read_i3);
 	ATF_TP_ADD_TC(tp, read_i4);
 	ATF_TP_ADD_TC(tp, io_read_auxv1);
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, regs1);
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, regs2);
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, regs3);
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, regs4);
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, regs5);
 	ATF_TP_ADD_TC_HAVE_FPREGS(tp, fpregs1);
 	ATF_TP_ADD_TC_HAVE_FPREGS(tp, fpregs2);
 	ATF_TP_ADD_TC_PT_STEP(tp, step1);
 	ATF_TP_ADD_TC_PT_STEP(tp, step2);
 	ATF_TP_ADD_TC_PT_STEP(tp, step3);
 	ATF_TP_ADD_TC_PT_STEP(tp, step4);