 @@ -1,1038 +1,1039 @@
-/*	$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.
+ *
  * 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.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"
 #include "t_ptrace_wait.h"
 #include "msg.h"
 #define PARENT_TO_CHILD(info, fds, msg) \
     ATF_REQUIRE(msg_write_child(info " to child " # fds, &fds, &msg, sizeof(msg)) == 0)
 #define CHILD_FROM_PARENT(info, fds, msg) \
     FORKEE_ASSERT(msg_read_parent(info " from parent " # fds, &fds, &msg, sizeof(msg)) == 0)
 #define CHILD_TO_PARENT(info, fds, msg) \
     FORKEE_ASSERT(msg_write_parent(info " to parent " # fds, &fds, &msg, sizeof(msg)) == 0)
 #define PARENT_FROM_CHILD(info, fds, msg) \
     ATF_REQUIRE(msg_read_child(info " from parent " # fds, &fds, &msg, sizeof(msg)) == 0)
 ATF_TC(traceme1);
 ATF_TC_HEAD(traceme1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify SIGSTOP followed by _exit(2) in a child");
+}
 ATF_TC_BODY(traceme1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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("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(traceme2);
 ATF_TC_HEAD(traceme2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify SIGSTOP followed by _exit(2) in a child");
+}
 static int traceme2_caught = 0;
 static void
 traceme2_sighandler(int sig)
+{
 	FORKEE_ASSERT_EQ(sig, SIGINT);
 	++traceme2_caught;
+}
 ATF_TC_BODY(traceme2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP, sigsent = SIGINT;
 	pid_t child, wpid;
 	struct sigaction sa;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		sa.sa_handler = traceme2_sighandler;
 		sa.sa_flags = SA_SIGINFO;
 		sigemptyset(&sa.sa_mask);
 		FORKEE_ASSERT(sigaction(sigsent, &sa, NULL) != -1);
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		FORKEE_ASSERT_EQ(traceme2_caught, 1);
 		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("Before resuming the child process where it left off and with "
 	    "signal %s to be sent\n", strsignal(sigsent));
 	ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, sigsent) != -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 exited child\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 ATF_TC(traceme3);
 ATF_TC_HEAD(traceme3, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify SIGSTOP followed by termination by a signal in a child");
+}
 ATF_TC_BODY(traceme3, tc)
+{
 	const int sigval = SIGSTOP, sigsent = SIGINT /* Without core-dump */;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		/* NOTREACHED */
 		FORKEE_ASSERTX(0 &&
 		    "Child should be terminated by a signal from its parent");
+	}
 	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("Before resuming the child process where it left off and with "
 	    "signal %s to be sent\n", strsignal(sigsent));
 	ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, sigsent) != -1);
 	printf("Before calling %s() for the child\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_signaled(status, sigsent, 0);
 	printf("Before calling %s() for the exited child\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 ATF_TC(traceme4);
 ATF_TC_HEAD(traceme4, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify SIGSTOP followed by SIGCONT and _exit(2) in a child");
+}
 ATF_TC_BODY(traceme4, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP, sigsent = SIGCONT;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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 raising %s from child\n", strsignal(sigsent));
 		FORKEE_ASSERT(raise(sigsent) == 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("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_stopped(status, sigsent);
 	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 exited child\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 #if defined(TWAIT_HAVE_PID)
 ATF_TC(attach1);
 ATF_TC_HEAD(attach1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Assert that tracer sees process termination before the parent");
+}
 ATF_TC_BODY(attach1, tc)
+{
 	struct msg_fds parent_tracee, parent_tracer;
 	const int exitval_tracee = 5;
 	const int exitval_tracer = 10;
 	pid_t tracee, tracer, wpid;
 	uint8_t msg = 0xde; /* dummy message for IPC based on pipe(2) */
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	printf("Spawn tracee\n");
 	ATF_REQUIRE(msg_open(&parent_tracee) == 0);
 	tracee = atf_utils_fork();
 	if (tracee == 0) {
 		// Wait for parent to let us exit
 		CHILD_FROM_PARENT("exit tracee", parent_tracee, msg);
 		_exit(exitval_tracee);
+	}
 	printf("Spawn debugger\n");
 	ATF_REQUIRE(msg_open(&parent_tracer) == 0);
 	tracer = atf_utils_fork();
 	if (tracer == 0) {
 		printf("Before calling PT_ATTACH from tracee %d\n", getpid());
 		FORKEE_ASSERT(ptrace(PT_ATTACH, tracee, NULL, 0) != -1);
 		/* Wait for tracee and assert that it was stopped w/ SIGSTOP */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_stopped(status, SIGSTOP);
 		/* Resume tracee with PT_CONTINUE */
 		FORKEE_ASSERT(ptrace(PT_CONTINUE, tracee, (void *)1, 0) != -1);
 		/* Inform parent that tracer has attached to tracee */
 		CHILD_TO_PARENT("tracer ready", parent_tracer, msg);
 		/* Wait for parent to tell use that tracee should have exited */
 		CHILD_FROM_PARENT("wait for tracee exit", parent_tracer, msg);
 		/* Wait for tracee and assert that it exited */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_exited(status, exitval_tracee);
 		printf("Tracee %d exited with %d\n", tracee, exitval_tracee);
 		printf("Before exiting of the tracer process\n");
 		_exit(exitval_tracer);
+	}
 	printf("Wait for the tracer to attach to the tracee\n");
 	PARENT_FROM_CHILD("tracer ready", parent_tracer, msg);
 	printf("Resume the tracee and let it exit\n");
 	PARENT_TO_CHILD("exit tracee", parent_tracee,  msg);
 	printf("Detect that tracee is zombie\n");
 	await_zombie(tracee);
 	printf("Assert that there is no status about tracee %d - "
 	    "Tracer must detect zombie first - calling %s()\n", tracee,
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, &status, WNOHANG), 0);
 	printf("Tell the tracer child should have exited\n");
 	PARENT_TO_CHILD("wait for tracee exit", parent_tracer,  msg);
 	printf("Wait for tracer to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	printf("Wait from tracer child to complete waiting for tracee\n");
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracer, &status, 0),
 	    tracer);
 	validate_status_exited(status, exitval_tracer);
 	printf("Wait for tracee to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracee, &status, WNOHANG),
 	    tracee);
 	validate_status_exited(status, exitval_tracee);
 	msg_close(&parent_tracer);
 	msg_close(&parent_tracee);
+}
 #endif
 #if defined(TWAIT_HAVE_PID)
 ATF_TC(attach2);
 ATF_TC_HEAD(attach2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Assert that any tracer sees process termination before its "
 	    "parent");
+}
 ATF_TC_BODY(attach2, tc)
+{
 	struct msg_fds parent_tracer, parent_tracee;
 	const int exitval_tracee = 5;
 	const int exitval_tracer1 = 10, exitval_tracer2 = 20;
 	pid_t tracee, tracer, wpid;
 	uint8_t msg = 0xde; /* dummy message for IPC based on pipe(2) */
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	printf("Spawn tracee\n");
 	ATF_REQUIRE(msg_open(&parent_tracee) == 0);
 	tracee = atf_utils_fork();
 	if (tracee == 0) {
 		/* Wait for message from the parent */
 		CHILD_FROM_PARENT("Message 1", parent_tracee, msg);
 		_exit(exitval_tracee);
+	}
 	printf("Spawn debugger\n");
 	ATF_REQUIRE(msg_open(&parent_tracer) == 0);
 	tracer = atf_utils_fork();
 	if (tracer == 0) {
 		/* Fork again and drop parent to reattach to PID 1 */
 		tracer = atf_utils_fork();
 		if (tracer != 0)
 			_exit(exitval_tracer1);
 		printf("Before calling PT_ATTACH from tracee %d\n", getpid());
 		FORKEE_ASSERT(ptrace(PT_ATTACH, tracee, NULL, 0) != -1);
 		/* Wait for tracee and assert that it was stopped w/ SIGSTOP */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_stopped(status, SIGSTOP);
 		/* Resume tracee with PT_CONTINUE */
 		FORKEE_ASSERT(ptrace(PT_CONTINUE, tracee, (void *)1, 0) != -1);
 		/* Inform parent that tracer has attached to tracee */
 		CHILD_TO_PARENT("Message 1", parent_tracer, msg);
 		CHILD_FROM_PARENT("Message 2", parent_tracer, msg);
 		/* Wait for tracee and assert that it exited */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_exited(status, exitval_tracee);
 		printf("Before exiting of the tracer process\n");
 		_exit(exitval_tracer2);
+	}
 	printf("Wait for the tracer process (direct child) to exit calling "
 	    "%s()\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracer, &status, 0), tracer);
 	validate_status_exited(status, exitval_tracer1);
 	printf("Wait for the non-exited tracee process with %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, NULL, WNOHANG), 0);
 	printf("Wait for the tracer to attach to the tracee\n");
 	PARENT_FROM_CHILD("Message 1", parent_tracer, msg);
 	printf("Resume the tracee and let it exit\n");
 	PARENT_TO_CHILD("Message 1", parent_tracee, msg);
 	printf("Detect that tracee is zombie\n");
 	await_zombie(tracee);
 	printf("Assert that there is no status about tracee - "
 	    "Tracer must detect zombie first - calling %s()\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, &status, WNOHANG), 0);
 	printf("Resume the tracer and let it detect exited tracee\n");
 	PARENT_TO_CHILD("Message 2", parent_tracer, msg);
 	printf("Wait for tracee to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracee, &status, WNOHANG),
 	    tracee);
 	validate_status_exited(status, exitval_tracee);
 	msg_close(&parent_tracer);
 	msg_close(&parent_tracee);
+}
 #endif
 ATF_TC(attach3);
 ATF_TC_HEAD(attach3, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Assert that tracer parent can PT_ATTACH to its child");
+}
 ATF_TC_BODY(attach3, tc)
+{
 	struct msg_fds parent_tracee;
 	const int exitval_tracee = 5;
 	pid_t tracee, wpid;
 	uint8_t msg = 0xde; /* dummy message for IPC based on pipe(2) */
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	printf("Spawn tracee\n");
 	ATF_REQUIRE(msg_open(&parent_tracee) == 0);
 	tracee = atf_utils_fork();
 	if (tracee == 0) {
 		CHILD_FROM_PARENT("Message 1", parent_tracee, msg);
 		printf("Parent should now attach to tracee\n");
 		CHILD_FROM_PARENT("Message 2", parent_tracee, msg);
 		/* Wait for message from the parent */
 		_exit(exitval_tracee);
+	}
 	PARENT_TO_CHILD("Message 1", parent_tracee, msg);
 	printf("Before calling PT_ATTACH for tracee %d\n", tracee);
 	ATF_REQUIRE(ptrace(PT_ATTACH, tracee, NULL, 0) != -1);
 	printf("Wait for the stopped tracee process with %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 	validate_status_stopped(status, SIGSTOP);
 	printf("Resume tracee with PT_CONTINUE\n");
 	ATF_REQUIRE(ptrace(PT_CONTINUE, tracee, (void *)1, 0) != -1);
 	printf("Let the tracee exit now\n");
 	PARENT_TO_CHILD("Message 2", parent_tracee, msg);
 	printf("Wait for tracee to exit with %s()\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 	validate_status_exited(status, exitval_tracee);
 	printf("Before calling %s() for tracee\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD,
 	    wpid = TWAIT_GENERIC(tracee, &status, 0));
 	msg_close(&parent_tracee);
+}
 ATF_TC(attach4);
 ATF_TC_HEAD(attach4, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Assert that tracer child can PT_ATTACH to its parent");
+}
 ATF_TC_BODY(attach4, tc)
+{
 	struct msg_fds parent_tracee;
 	const int exitval_tracer = 5;
 	pid_t tracer, wpid;
 	uint8_t msg = 0xde; /* dummy message for IPC based on pipe(2) */
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	printf("Spawn tracer\n");
 	ATF_REQUIRE(msg_open(&parent_tracee) == 0);
 	tracer = atf_utils_fork();
 	if (tracer == 0) {
 		/* Wait for message from the parent */
 		CHILD_FROM_PARENT("Message 1", parent_tracee, msg);
 		printf("Attach to parent PID %d with PT_ATTACH from child\n",
 		    getppid());
 		FORKEE_ASSERT(ptrace(PT_ATTACH, getppid(), NULL, 0) != -1);
 		printf("Wait for the stopped parent process with %s()\n",
 		    TWAIT_FNAME);
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(getppid(), &status, 0), getppid());
 		forkee_status_stopped(status, SIGSTOP);
 		printf("Resume parent with PT_DETACH\n");
 		FORKEE_ASSERT(ptrace(PT_DETACH, getppid(), (void *)1, 0)
 		    != -1);
 		/* Tell parent we are ready */
 		CHILD_TO_PARENT("Message 1", parent_tracee, msg);
 		_exit(exitval_tracer);
+	}
 	printf("Wait for the tracer to become ready\n");
 	PARENT_TO_CHILD("Message 1", parent_tracee, msg);
 	printf("Allow the tracer to exit now\n");
 	PARENT_FROM_CHILD("Message 1", parent_tracee, msg);
 	printf("Wait for tracer to exit with %s()\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracer, &status, 0), tracer);
 	validate_status_exited(status, exitval_tracer);
 	printf("Before calling %s() for tracer\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD,
 	    wpid = TWAIT_GENERIC(tracer, &status, 0));
 	msg_close(&parent_tracee);
+}
 #if defined(TWAIT_HAVE_PID)
 ATF_TC(attach5);
 ATF_TC_HEAD(attach5, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Assert that tracer sees its parent when attached to tracer "
 	    "(check getppid(2))");
+}
 ATF_TC_BODY(attach5, tc)
+{
 	struct msg_fds parent_tracer, parent_tracee;
 	const int exitval_tracee = 5;
 	const int exitval_tracer = 10;
 	pid_t parent, tracee, tracer, wpid;
 	uint8_t msg = 0xde; /* dummy message for IPC based on pipe(2) */
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	printf("Spawn tracee\n");
 	ATF_REQUIRE(msg_open(&parent_tracer) == 0);
 	ATF_REQUIRE(msg_open(&parent_tracee) == 0);
 	tracee = atf_utils_fork();
 	if (tracee == 0) {
 		parent = getppid();
 		/* Emit message to the parent */
 		CHILD_TO_PARENT("tracee ready", parent_tracee, msg);
 		CHILD_FROM_PARENT("exit tracee", parent_tracee, msg);
 		FORKEE_ASSERT_EQ(parent, getppid());
 		_exit(exitval_tracee);
+	}
 	printf("Wait for child to record its parent identifier (pid)\n");
 	PARENT_FROM_CHILD("tracee ready", parent_tracee, msg);
 	printf("Spawn debugger\n");
 	tracer = atf_utils_fork();
 	if (tracer == 0) {
 		/* No IPC to communicate with the child */
 		printf("Before calling PT_ATTACH from tracee %d\n", getpid());
 		FORKEE_ASSERT(ptrace(PT_ATTACH, tracee, NULL, 0) != -1);
 		/* Wait for tracee and assert that it was stopped w/ SIGSTOP */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_stopped(status, SIGSTOP);
 		/* Resume tracee with PT_CONTINUE */
 		FORKEE_ASSERT(ptrace(PT_CONTINUE, tracee, (void *)1, 0) != -1);
 		/* Inform parent that tracer has attached to tracee */
 		CHILD_TO_PARENT("tracer ready", parent_tracer, msg);
 		/* Wait for parent to tell use that tracee should have exited */
 		CHILD_FROM_PARENT("wait for tracee exit", parent_tracer, msg);
 		/* Wait for tracee and assert that it exited */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_exited(status, exitval_tracee);
 		printf("Before exiting of the tracer process\n");
 		_exit(exitval_tracer);
+	}
 	printf("Wait for the tracer to attach to the tracee\n");
 	PARENT_FROM_CHILD("tracer ready",  parent_tracer, msg);
 	printf("Resume the tracee and let it exit\n");
 	PARENT_TO_CHILD("exit tracee",  parent_tracee, msg);
 	printf("Detect that tracee is zombie\n");
 	await_zombie(tracee);
 	printf("Assert that there is no status about tracee - "
 	    "Tracer must detect zombie first - calling %s()\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, &status, WNOHANG), 0);
 	printf("Tell the tracer child should have exited\n");
 	PARENT_TO_CHILD("wait for tracee exit",  parent_tracer, msg);
 	printf("Wait from tracer child to complete waiting for tracee\n");
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracer, &status, 0),
 	    tracer);
 	validate_status_exited(status, exitval_tracer);
 	printf("Wait for tracee to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracee, &status, WNOHANG),
 	    tracee);
 	validate_status_exited(status, exitval_tracee);
 	msg_close(&parent_tracer);
 	msg_close(&parent_tracee);
+}
 #endif
 #if defined(TWAIT_HAVE_PID)
 ATF_TC(attach6);
 ATF_TC_HEAD(attach6, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Assert that tracer sees its parent when attached to tracer "
 	    "(check sysctl(7) and struct kinfo_proc2)");
+}
 ATF_TC_BODY(attach6, tc)
+{
 	struct msg_fds parent_tracee, parent_tracer;
 	const int exitval_tracee = 5;
 	const int exitval_tracer = 10;
 	pid_t parent, tracee, tracer, wpid;
 	uint8_t msg = 0xde; /* dummy message for IPC based on pipe(2) */
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	int name[CTL_MAXNAME];
 	struct kinfo_proc2 kp;
 	size_t len = sizeof(kp);
 	unsigned int namelen;
 	printf("Spawn tracee\n");
 	ATF_REQUIRE(msg_open(&parent_tracee) == 0);
 	ATF_REQUIRE(msg_open(&parent_tracer) == 0);
 	tracee = atf_utils_fork();
 	if (tracee == 0) {
 		parent = getppid();
 		/* Emit message to the parent */
 		CHILD_TO_PARENT("Message 1", parent_tracee, msg);
 		CHILD_FROM_PARENT("Message 2", parent_tracee, msg);
 		namelen = 0;
 		name[namelen++] = CTL_KERN;
 		name[namelen++] = KERN_PROC2;
 		name[namelen++] = KERN_PROC_PID;
 		name[namelen++] = getpid();
 		name[namelen++] = len;
 		name[namelen++] = 1;
 		FORKEE_ASSERT(sysctl(name, namelen, &kp, &len, NULL, 0) == 0);
 		FORKEE_ASSERT_EQ(parent, kp.p_ppid);
 		_exit(exitval_tracee);
+	}
 	printf("Wait for child to record its parent identifier (pid)\n");
 	PARENT_FROM_CHILD("Message 1", parent_tracee, msg);
 	printf("Spawn debugger\n");
 	tracer = atf_utils_fork();
 	if (tracer == 0) {
 		/* No IPC to communicate with the child */
 		printf("Before calling PT_ATTACH from tracee %d\n", getpid());
 		FORKEE_ASSERT(ptrace(PT_ATTACH, tracee, NULL, 0) != -1);
 		/* Wait for tracee and assert that it was stopped w/ SIGSTOP */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_stopped(status, SIGSTOP);
 		/* Resume tracee with PT_CONTINUE */
 		FORKEE_ASSERT(ptrace(PT_CONTINUE, tracee, (void *)1, 0) != -1);
 		/* Inform parent that tracer has attached to tracee */
 		CHILD_TO_PARENT("Message 1", parent_tracer, msg);
 		CHILD_FROM_PARENT("Message 2", parent_tracer, msg);
 		/* Wait for tracee and assert that it exited */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_exited(status, exitval_tracee);
 		printf("Before exiting of the tracer process\n");
 		_exit(exitval_tracer);
+	}
 	printf("Wait for the tracer to attach to the tracee\n");
 	PARENT_FROM_CHILD("Message 1", parent_tracer, msg);
 	printf("Resume the tracee and let it exit\n");
 	PARENT_TO_CHILD("Message 1", parent_tracee, msg);
 	printf("Detect that tracee is zombie\n");
 	await_zombie(tracee);
 	printf("Assert that there is no status about tracee - "
 	    "Tracer must detect zombie first - calling %s()\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, &status, WNOHANG), 0);
 	printf("Resume the tracer and let it detect exited tracee\n");
 	PARENT_TO_CHILD("Message 2", parent_tracer, msg);
 	printf("Wait for tracer to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracer, &status, 0),
 	    tracer);
 	validate_status_exited(status, exitval_tracer);
 	printf("Wait for tracee to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracee, &status, WNOHANG),
 	    tracee);
 	validate_status_exited(status, exitval_tracee);
 	msg_close(&parent_tracee);
 	msg_close(&parent_tracer);
+}
 #endif
 #if defined(TWAIT_HAVE_PID)
 ATF_TC(attach7);
 ATF_TC_HEAD(attach7, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Assert that tracer sees its parent when attached to tracer "
 	    "(check /proc/curproc/status 3rd column)");
+}
 ATF_TC_BODY(attach7, tc)
+{
 	struct msg_fds parent_tracee, parent_tracer;
 	int rv;
 	const int exitval_tracee = 5;
 	const int exitval_tracer = 10;
 	pid_t parent, tracee, tracer, wpid;
 	uint8_t msg = 0xde; /* dummy message for IPC based on pipe(2) */
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	FILE *fp;
 	struct stat st;
 	const char *fname = "/proc/curproc/status";
 	char s_executable[MAXPATHLEN];
 	int s_pid, s_ppid;
 	/*
 	 * Format:
 	 *  EXECUTABLE PID PPID ...
 	 */
 	ATF_REQUIRE((rv = stat(fname, &st)) == 0 || (errno == ENOENT));
 	if (rv != 0) {
 		atf_tc_skip("/proc/curproc/status not found");
+	}
 	printf("Spawn tracee\n");
 	ATF_REQUIRE(msg_open(&parent_tracee) == 0);
 	ATF_REQUIRE(msg_open(&parent_tracer) == 0);
 	tracee = atf_utils_fork();
 	if (tracee == 0) {
 		parent = getppid();
 		// Wait for parent to let us exit
 		CHILD_TO_PARENT("tracee ready", parent_tracee, msg);
 		CHILD_FROM_PARENT("tracee exit", parent_tracee, msg);
 		FORKEE_ASSERT((fp = fopen(fname, "r")) != NULL);
 		fscanf(fp, "%s %d %d", s_executable, &s_pid, &s_ppid);
 		FORKEE_ASSERT(fclose(fp) == 0);
 		FORKEE_ASSERT_EQ(parent, s_ppid);
 		_exit(exitval_tracee);
+	}
 	printf("Wait for child to record its parent identifier (pid)\n");
 	PARENT_FROM_CHILD("tracee ready", parent_tracee, msg);
 	printf("Spawn debugger\n");
 	tracer = atf_utils_fork();
 	if (tracer == 0) {
 		printf("Before calling PT_ATTACH from tracee %d\n", getpid());
 		FORKEE_ASSERT(ptrace(PT_ATTACH, tracee, NULL, 0) != -1);
 		/* Wait for tracee and assert that it was stopped w/ SIGSTOP */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_stopped(status, SIGSTOP);
 		/* Resume tracee with PT_CONTINUE */
 		FORKEE_ASSERT(ptrace(PT_CONTINUE, tracee, (void *)1, 0) != -1);
 		/* Inform parent that tracer has attached to tracee */
 		CHILD_TO_PARENT("tracer ready", parent_tracer, msg);
 		/* Wait for parent to tell use that tracee should have exited */
 		CHILD_FROM_PARENT("wait for tracee exit", parent_tracer, msg);
 		/* Wait for tracee and assert that it exited */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_exited(status, exitval_tracee);
 		printf("Before exiting of the tracer process\n");
 		_exit(exitval_tracer);
+	}
 	printf("Wait for the tracer to attach to the tracee\n");
 	PARENT_FROM_CHILD("tracer ready", parent_tracer, msg);
 	printf("Resume the tracee and let it exit\n");
 	PARENT_TO_CHILD("tracee exit", parent_tracee, msg);
 	printf("Detect that tracee is zombie\n");
 	await_zombie(tracee);
 	printf("Assert that there is no status about tracee - "
 	    "Tracer must detect zombie first - calling %s()\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, &status, WNOHANG), 0);
 	printf("Resume the tracer and let it detect exited tracee\n");
 	PARENT_TO_CHILD("Message 2", parent_tracer, msg);
 	printf("Wait for tracer to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracer, &status, 0),
 	    tracer);
 	validate_status_exited(status, exitval_tracer);
 	printf("Wait for tracee to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracee, &status, WNOHANG),
 	    tracee);
 	validate_status_exited(status, exitval_tracee);
 	msg_close(&parent_tracee);
 	msg_close(&parent_tracer);
+}
 #endif
 ATF_TC(eventmask1);
 ATF_TC_HEAD(eventmask1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that empty EVENT_MASK is preserved");
+}
 ATF_TC_BODY(eventmask1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_event_t set_event, get_event;
 	const int len = sizeof(ptrace_event_t);
 	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);
 	set_event.pe_set_event = 0;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &set_event, len) != -1);
 	ATF_REQUIRE(ptrace(PT_GET_EVENT_MASK, child, &get_event, len) != -1);
 	ATF_REQUIRE(memcmp(&set_event, &get_event, len) == 0);
 	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(eventmask2);
 ATF_TC_HEAD(eventmask2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that PTRACE_FORK in EVENT_MASK is preserved");
+}
 ATF_TC_BODY(eventmask2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_event_t set_event, get_event;
 	const int len = sizeof(ptrace_event_t);
 @@ -1411,1998 +1412,2064 @@ ATF_TC_BODY(fork1, tc)
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_exited(status, exitval);
 	printf("Before calling %s() for the child - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 #endif
 ATF_TC(fork2);
 ATF_TC_HEAD(fork2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that fork(2) is not intercepted by ptrace(2) with empty "
 	    "EVENT_MASK");
+}
 ATF_TC_BODY(fork2, tc)
+{
 	const int exitval = 5;
 	const int exitval2 = 15;
 	const int sigval = SIGSTOP;
 	pid_t child, child2, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 	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);
 		FORKEE_ASSERT((child2 = fork()) != 1);
 		if (child2 == 0)
 			_exit(exitval2);
 		FORKEE_REQUIRE_SUCCESS
 		    (wpid = TWAIT_GENERIC(child2, &status, 0), child2);
 		forkee_status_exited(status, exitval2);
 		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("Set empty EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = 0;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
 	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 - expected stopped "
 	    "SIGCHLD\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGCHLD);
 	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 - expected exited\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 - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 #if defined(TWAIT_HAVE_PID)
 ATF_TC(vfork1);
 ATF_TC_HEAD(vfork1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that vfork(2) is intercepted by ptrace(2) with EVENT_MASK "
 	    "set to PTRACE_VFORK");
+}
 ATF_TC_BODY(vfork1, tc)
+{
 	const int exitval = 5;
 	const int exitval2 = 15;
 	const int sigval = SIGSTOP;
 	pid_t child, child2, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_state_t state;
 	const int slen = sizeof(state);
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 	atf_tc_expect_fail("PR kern/51630");
 	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);
 		FORKEE_ASSERT((child2 = vfork()) != 1);
 		if (child2 == 0)
 			_exit(exitval2);
 		FORKEE_REQUIRE_SUCCESS
 		    (wpid = TWAIT_GENERIC(child2, &status, 0), child2);
 		forkee_status_exited(status, exitval2);
 		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("Enable PTRACE_VFORK in EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = PTRACE_VFORK;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
 	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 %d\n", TWAIT_FNAME, child);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGTRAP);
 	ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_VFORK);
 	child2 = state.pe_other_pid;
 	printf("Reported PTRACE_VFORK event with forkee %d\n", child2);
 	printf("Before calling %s() for the forkee %d of the child %d\n",
 	    TWAIT_FNAME, child2, child);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0),
 	    child2);
 	validate_status_stopped(status, SIGTRAP);
 	ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child2, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_VFORK);
 	ATF_REQUIRE_EQ(state.pe_other_pid, child);
 	printf("Before resuming the forkee process where it left off and "
 	    "without signal to be sent\n");
 	ATF_REQUIRE(ptrace(PT_CONTINUE, child2, (void *)1, 0) != -1);
 	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 forkee - expected exited\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0),
 	    child2);
 	validate_status_exited(status, exitval2);
 	printf("Before calling %s() for the forkee - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD,
 	    wpid = TWAIT_GENERIC(child2, &status, 0));
 	printf("Before calling %s() for the child - expected stopped "
 	    "SIGCHLD\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGCHLD);
 	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 - expected exited\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 - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 #endif
 ATF_TC(vfork2);
 ATF_TC_HEAD(vfork2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that vfork(2) is not intercepted by ptrace(2) with empty "
 	    "EVENT_MASK");
+}
 ATF_TC_BODY(vfork2, tc)
+{
 	const int exitval = 5;
 	const int exitval2 = 15;
 	const int sigval = SIGSTOP;
 	pid_t child, child2, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 	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);
 		FORKEE_ASSERT((child2 = vfork()) != 1);
 		if (child2 == 0)
 			_exit(exitval2);
 		FORKEE_REQUIRE_SUCCESS
 		    (wpid = TWAIT_GENERIC(child2, &status, 0), child2);
 		forkee_status_exited(status, exitval2);
 		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("Set empty EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = 0;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
 	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 - expected stopped "
 	    "SIGCHLD\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGCHLD);
 	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 - expected exited\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 - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 ATF_TC(vforkdone1);
 ATF_TC_HEAD(vforkdone1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that vfork(2) is intercepted by ptrace(2) with EVENT_MASK "
 	    "set to PTRACE_VFORK_DONE");
+}
 ATF_TC_BODY(vforkdone1, tc)
+{
 	const int exitval = 5;
 	const int exitval2 = 15;
 	const int sigval = SIGSTOP;
 	pid_t child, child2, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_state_t state;
 	const int slen = sizeof(state);
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 	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);
 		FORKEE_ASSERT((child2 = vfork()) != 1);
 		if (child2 == 0)
 			_exit(exitval2);
 		FORKEE_REQUIRE_SUCCESS
 		    (wpid = TWAIT_GENERIC(child2, &status, 0), child2);
 		forkee_status_exited(status, exitval2);
 		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("Enable PTRACE_VFORK in EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = PTRACE_VFORK_DONE;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
 	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 %d\n", TWAIT_FNAME, child);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGTRAP);
 	ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_VFORK_DONE);
 	child2 = state.pe_other_pid;
 	printf("Reported PTRACE_VFORK_DONE event with forkee %d\n", child2);
 	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 - expected stopped "
 	    "SIGCHLD\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGCHLD);
 	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 - expected exited\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 - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 ATF_TC(vforkdone2);
 ATF_TC_HEAD(vforkdone2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that vfork(2) is intercepted by ptrace(2) with EVENT_MASK "
 	    "set to PTRACE_FORK | PTRACE_VFORK_DONE");
+}
 ATF_TC_BODY(vforkdone2, tc)
+{
 	const int exitval = 5;
 	const int exitval2 = 15;
 	const int sigval = SIGSTOP;
 	pid_t child, child2, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_state_t state;
 	const int slen = sizeof(state);
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 	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);
 		FORKEE_ASSERT((child2 = vfork()) != 1);
 		if (child2 == 0)
 			_exit(exitval2);
 		FORKEE_REQUIRE_SUCCESS
 		    (wpid = TWAIT_GENERIC(child2, &status, 0), child2);
 		forkee_status_exited(status, exitval2);
 		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("Enable PTRACE_VFORK in EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = PTRACE_FORK | PTRACE_VFORK_DONE;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
 	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 %d\n", TWAIT_FNAME, child);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGTRAP);
 	ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_VFORK_DONE);
 	child2 = state.pe_other_pid;
 	printf("Reported PTRACE_VFORK_DONE event with forkee %d\n", child2);
 	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 - expected stopped "
 	    "SIGCHLD\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGCHLD);
 	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 - expected exited\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 - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 ATF_TC(io_read_d1);
 ATF_TC_HEAD(io_read_d1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_READ_D and len = sizeof(uint8_t)");
+}
 ATF_TC_BODY(io_read_d1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint8_t lookup_me = 0;
 	const uint8_t magic = 0xab;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_READ_D,
 		.piod_offs = &lookup_me,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me = magic;
 		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 lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me, magic,
 	    "got value %" PRIx8 " != expected %" PRIx8, lookup_me, magic);
 	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_d2);
 ATF_TC_HEAD(io_read_d2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_READ_D and len = sizeof(uint16_t)");
+}
 ATF_TC_BODY(io_read_d2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint16_t lookup_me = 0;
 	const uint16_t magic = 0x1234;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_READ_D,
 		.piod_offs = &lookup_me,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me = magic;
 		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 lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me, magic,
 	    "got value %" PRIx16 " != expected %" PRIx16, lookup_me, magic);
 	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_d3);
 ATF_TC_HEAD(io_read_d3, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_READ_D and len = sizeof(uint32_t)");
+}
 ATF_TC_BODY(io_read_d3, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint32_t lookup_me = 0;
 	const uint32_t magic = 0x1234abcd;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_READ_D,
 		.piod_offs = &lookup_me,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me = magic;
 		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 lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me, magic,
 	    "got value %" PRIx32 " != expected %" PRIx32, lookup_me, magic);
 	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_d4);
 ATF_TC_HEAD(io_read_d4, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_READ_D and len = sizeof(uint64_t)");
+}
 ATF_TC_BODY(io_read_d4, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint64_t lookup_me = 0;
 	const uint64_t magic = 0x1234abcd9876dcfa;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_READ_D,
 		.piod_offs = &lookup_me,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me = magic;
 		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 lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me, magic,
 	    "got value %" PRIx64 " != expected %" PRIx64, lookup_me, magic);
 	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_write_d1);
 ATF_TC_HEAD(io_write_d1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint8_t)");
+}
 ATF_TC_BODY(io_write_d1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint8_t lookup_me = 0;
 	const uint8_t magic = 0xab;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_WRITE_D,
 		.piod_offs = &lookup_me,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		FORKEE_ASSERT_EQ(lookup_me, magic);
 		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);
 	lookup_me = magic;
 	printf("Write new lookup_me to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	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_write_d2);
 ATF_TC_HEAD(io_write_d2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint16_t)");
+}
 ATF_TC_BODY(io_write_d2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint16_t lookup_me = 0;
 	const uint16_t magic = 0xab12;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_WRITE_D,
 		.piod_offs = &lookup_me,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		FORKEE_ASSERT_EQ(lookup_me, magic);
 		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);
 	lookup_me = magic;
 	printf("Write new lookup_me to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	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_write_d3);
 ATF_TC_HEAD(io_write_d3, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint32_t)");
+}
 ATF_TC_BODY(io_write_d3, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint32_t lookup_me = 0;
 	const uint32_t magic = 0xab127643;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_WRITE_D,
 		.piod_offs = &lookup_me,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		FORKEE_ASSERT_EQ(lookup_me, magic);
 		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);
 	lookup_me = magic;
 	printf("Write new lookup_me to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	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_write_d4);
 ATF_TC_HEAD(io_write_d4, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_WRITE_D and len = sizeof(uint64_t)");
+}
 ATF_TC_BODY(io_write_d4, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint64_t lookup_me = 0;
 	const uint64_t magic = 0xab12764376490123;
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_WRITE_D,
 		.piod_offs = &lookup_me,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		FORKEE_ASSERT_EQ(lookup_me, magic);
 		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);
 	lookup_me = magic;
 	printf("Write new lookup_me to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	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;
 	const int magic = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me = magic;
 		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 lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me = ptrace(PT_READ_D, child, &lookup_me, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me, magic,
 	    "got value %#x != expected %#x", lookup_me, magic);
 	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_d2);
 ATF_TC_HEAD(read_d2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_READ_D called twice");
+}
 ATF_TC_BODY(read_d2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me1 = 0;
 	int lookup_me2 = 0;
 	const int magic1 = (int)random();
 	const int magic2 = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me1 = magic1;
 		lookup_me2 = magic2;
 		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 lookup_me1 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me1 = ptrace(PT_READ_D, child, &lookup_me1, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me1, magic1,
 	    "got value %#x != expected %#x", lookup_me1, magic1);
 	printf("Read new lookup_me2 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me2 = ptrace(PT_READ_D, child, &lookup_me2, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me2, magic2,
 	    "got value %#x != expected %#x", lookup_me2, magic2);
 	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_d3);
 ATF_TC_HEAD(read_d3, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_READ_D called three times");
+}
 ATF_TC_BODY(read_d3, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me1 = 0;
 	int lookup_me2 = 0;
 	int lookup_me3 = 0;
 	const int magic1 = (int)random();
 	const int magic2 = (int)random();
 	const int magic3 = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me1 = magic1;
 		lookup_me2 = magic2;
 		lookup_me3 = magic3;
 		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 lookup_me1 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me1 = ptrace(PT_READ_D, child, &lookup_me1, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me1, magic1,
 	    "got value %#x != expected %#x", lookup_me1, magic1);
 	printf("Read new lookup_me2 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me2 = ptrace(PT_READ_D, child, &lookup_me2, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me2, magic2,
 	    "got value %#x != expected %#x", lookup_me2, magic2);
 	printf("Read new lookup_me3 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me3 = ptrace(PT_READ_D, child, &lookup_me3, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me3, magic3,
 	    "got value %#x != expected %#x", lookup_me3, magic3);
 	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_d4);
 ATF_TC_HEAD(read_d4, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_READ_D called four times");
+}
 ATF_TC_BODY(read_d4, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me1 = 0;
 	int lookup_me2 = 0;
 	int lookup_me3 = 0;
 	int lookup_me4 = 0;
 	const int magic1 = (int)random();
 	const int magic2 = (int)random();
 	const int magic3 = (int)random();
 	const int magic4 = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me1 = magic1;
 		lookup_me2 = magic2;
 		lookup_me3 = magic3;
 		lookup_me4 = magic4;
 		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 lookup_me1 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me1 = ptrace(PT_READ_D, child, &lookup_me1, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me1, magic1,
 	    "got value %#x != expected %#x", lookup_me1, magic1);
 	printf("Read new lookup_me2 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me2 = ptrace(PT_READ_D, child, &lookup_me2, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me2, magic2,
 	    "got value %#x != expected %#x", lookup_me2, magic2);
 	printf("Read new lookup_me3 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me3 = ptrace(PT_READ_D, child, &lookup_me3, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me3, magic3,
 	    "got value %#x != expected %#x", lookup_me3, magic3);
 	printf("Read new lookup_me4 from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me4 = ptrace(PT_READ_D, child, &lookup_me4, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me4, magic4,
 	    "got value %#x != expected %#x", lookup_me4, magic4);
 	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(write_d1);
 ATF_TC_HEAD(write_d1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_WRITE_D called once");
+}
 ATF_TC_BODY(write_d1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me = 0;
 	const int magic = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		FORKEE_ASSERT_EQ(lookup_me, magic);
 		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("Write new lookup_me to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me, magic) != -1);
 	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(write_d2);
 ATF_TC_HEAD(write_d2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_WRITE_D called twice");
+}
 ATF_TC_BODY(write_d2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me1 = 0;
 	int lookup_me2 = 0;
 	const int magic1 = (int)random();
 	const int magic2 = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		FORKEE_ASSERT_EQ(lookup_me1, magic1);
 		FORKEE_ASSERT_EQ(lookup_me2, magic2);
 		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("Write new lookup_me1 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me1, magic1) != -1);
 	printf("Write new lookup_me2 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me2, magic2) != -1);
 	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(write_d3);
 ATF_TC_HEAD(write_d3, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_WRITE_D called three times");
+}
 ATF_TC_BODY(write_d3, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me1 = 0;
 	int lookup_me2 = 0;
 	int lookup_me3 = 0;
 	const int magic1 = (int)random();
 	const int magic2 = (int)random();
 	const int magic3 = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		FORKEE_ASSERT_EQ(lookup_me1, magic1);
 		FORKEE_ASSERT_EQ(lookup_me2, magic2);
 		FORKEE_ASSERT_EQ(lookup_me3, magic3);
 		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("Write new lookup_me1 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me1, magic1) != -1);
 	printf("Write new lookup_me2 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me2, magic2) != -1);
 	printf("Write new lookup_me3 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me3, magic3) != -1);
 	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(write_d4);
 ATF_TC_HEAD(write_d4, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_WRITE_D called four times");
+}
 ATF_TC_BODY(write_d4, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me1 = 0;
 	int lookup_me2 = 0;
 	int lookup_me3 = 0;
 	int lookup_me4 = 0;
 	const int magic1 = (int)random();
 	const int magic2 = (int)random();
 	const int magic3 = (int)random();
 	const int magic4 = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		FORKEE_ASSERT_EQ(lookup_me1, magic1);
 		FORKEE_ASSERT_EQ(lookup_me2, magic2);
 		FORKEE_ASSERT_EQ(lookup_me3, magic3);
 		FORKEE_ASSERT_EQ(lookup_me4, magic4);
 		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("Write new lookup_me1 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me1, magic1) != -1);
 	printf("Write new lookup_me2 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me2, magic2) != -1);
 	printf("Write new lookup_me3 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me3, magic3) != -1);
 	printf("Write new lookup_me4 to tracee (PID=%d) from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_WRITE_D, child, &lookup_me4, magic4) != -1);
 	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_d_write_d_handshake1);
 ATF_TC_HEAD(io_read_d_write_d_handshake1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_READ_D and PIOD_WRITE_D handshake");
+}
 ATF_TC_BODY(io_read_d_write_d_handshake1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint8_t lookup_me_fromtracee = 0;
 	const uint8_t magic_fromtracee = (uint8_t)random();
 	uint8_t lookup_me_totracee = 0;
 	const uint8_t magic_totracee = (uint8_t)random();
 	struct ptrace_io_desc io_fromtracee = {
 		.piod_op = PIOD_READ_D,
 		.piod_offs = &lookup_me_fromtracee,
 		.piod_addr = &lookup_me_fromtracee,
 		.piod_len = sizeof(lookup_me_fromtracee)
 	};
 	struct ptrace_io_desc io_totracee = {
 		.piod_op = PIOD_WRITE_D,
 		.piod_offs = &lookup_me_totracee,
 		.piod_addr = &lookup_me_totracee,
 		.piod_len = sizeof(lookup_me_totracee)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me_fromtracee = magic_fromtracee;
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		FORKEE_ASSERT_EQ(lookup_me_totracee, magic_totracee);
 		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 lookup_me_fromtracee PID=%d by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io_fromtracee, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me_fromtracee, magic_fromtracee,
 	    "got value %" PRIx8 " != expected %" PRIx8, lookup_me_fromtracee,
 	    magic_fromtracee);
 	lookup_me_totracee = magic_totracee;
 	printf("Write lookup_me_totracee to PID=%d by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io_totracee, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me_totracee, magic_totracee,
 	    "got value %" PRIx8 " != expected %" PRIx8, lookup_me_totracee,
 	    magic_totracee);
 	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_d_write_d_handshake2);
 ATF_TC_HEAD(io_read_d_write_d_handshake2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_WRITE_D and PIOD_READ_D handshake");
+}
 ATF_TC_BODY(io_read_d_write_d_handshake2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint8_t lookup_me_fromtracee = 0;
 	const uint8_t magic_fromtracee = (uint8_t)random();
 	uint8_t lookup_me_totracee = 0;
 	const uint8_t magic_totracee = (uint8_t)random();
 	struct ptrace_io_desc io_fromtracee = {
 		.piod_op = PIOD_READ_D,
 		.piod_offs = &lookup_me_fromtracee,
 		.piod_addr = &lookup_me_fromtracee,
 		.piod_len = sizeof(lookup_me_fromtracee)
 	};
 	struct ptrace_io_desc io_totracee = {
 		.piod_op = PIOD_WRITE_D,
 		.piod_offs = &lookup_me_totracee,
 		.piod_addr = &lookup_me_totracee,
 		.piod_len = sizeof(lookup_me_totracee)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me_fromtracee = magic_fromtracee;
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		FORKEE_ASSERT_EQ(lookup_me_totracee, magic_totracee);
 		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);
 	lookup_me_totracee = magic_totracee;
 	printf("Write lookup_me_totracee to PID=%d by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io_totracee, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me_totracee, magic_totracee,
 	    "got value %" PRIx8 " != expected %" PRIx8, lookup_me_totracee,
 	    magic_totracee);
 	printf("Read lookup_me_fromtracee PID=%d by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io_fromtracee, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me_fromtracee, magic_fromtracee,
 	    "got value %" PRIx8 " != expected %" PRIx8, lookup_me_fromtracee,
 	    magic_fromtracee);
 	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_d_write_d_handshake1);
 ATF_TC_HEAD(read_d_write_d_handshake1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_READ_D with PT_WRITE_D handshake");
+}
 ATF_TC_BODY(read_d_write_d_handshake1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me_fromtracee = 0;
 	const int magic_fromtracee = (int)random();
 	int lookup_me_totracee = 0;
 	const int magic_totracee = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me_fromtracee = magic_fromtracee;
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		FORKEE_ASSERT_EQ(lookup_me_totracee, magic_totracee);
 		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 lookup_me_fromtracee PID=%d by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me_fromtracee =
 	    ptrace(PT_READ_D, child, &lookup_me_fromtracee, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me_fromtracee, magic_fromtracee,
 	    "got value %#x != expected %#x", lookup_me_fromtracee,
 	    magic_fromtracee);
 	printf("Write new lookup_me_totracee to PID=%d from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE
 	    (ptrace(PT_WRITE_D, child, &lookup_me_totracee, magic_totracee)
 	    != -1);
 	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_d_write_d_handshake2);
 ATF_TC_HEAD(read_d_write_d_handshake2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_WRITE_D with PT_READ_D handshake");
+}
 ATF_TC_BODY(read_d_write_d_handshake2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	int lookup_me_fromtracee = 0;
 	const int magic_fromtracee = (int)random();
 	int lookup_me_totracee = 0;
 	const int magic_totracee = (int)random();
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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);
 		lookup_me_fromtracee = magic_fromtracee;
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		FORKEE_ASSERT_EQ(lookup_me_totracee, magic_totracee);
 		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("Write new lookup_me_totracee to PID=%d from tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE
 	    (ptrace(PT_WRITE_D, child, &lookup_me_totracee, magic_totracee)
 	    != -1);
 	printf("Read new lookup_me_fromtracee PID=%d by tracer (PID=%d)\n",
 	    child, getpid());
 	errno = 0;
 	lookup_me_fromtracee =
 	    ptrace(PT_READ_D, child, &lookup_me_fromtracee, 0);
 	ATF_REQUIRE_EQ(errno, 0);
 	ATF_REQUIRE_EQ_MSG(lookup_me_fromtracee, magic_fromtracee,
 	    "got value %#x != expected %#x", lookup_me_fromtracee,
 	    magic_fromtracee);
 	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));
+}
 /* These dummy functions are used to be copied with ptrace(2) calls */
 static int __used
 dummy_fn1(int a, int b, int c, int d)
+{
 	a *= 1;
 	b += 2;
 	c -= 3;
 	d /= 4;
 	return a + b * c - d;
+}
 static int __used
 dummy_fn2(int a, int b, int c, int d)
+{
 	a *= 4;
 	b += 3;
 	c -= 2;
 	d /= 1;
 	return a + b * c - d;
+}
 static int __used
 dummy_fn3(int a, int b, int c, int d)
+{
 	a *= 10;
 	b += 20;
 	c -= 30;
 	d /= 40;
 	return a + b * c - d;
+}
 static int __used
 dummy_fn4(int a, int b, int c, int d)
+{
 	a *= 40;
 	b += 30;
 	c -= 20;
 	d /= 10;
 	return a + b * c - d;
+}
 ATF_TC(io_read_i1);
 ATF_TC_HEAD(io_read_i1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify PT_IO with PIOD_READ_I and len = sizeof(uint8_t)");
+}
 ATF_TC_BODY(io_read_i1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 	uint8_t lookup_me = 0;
 	uint8_t magic;
 	memcpy(&magic, dummy_fn1, sizeof(magic));
 	struct ptrace_io_desc io = {
 		.piod_op = PIOD_READ_I,
 		.piod_offs = dummy_fn1,
 		.piod_addr = &lookup_me,
 		.piod_len = sizeof(lookup_me)
 	};
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	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 lookup_me from tracee (PID=%d) by tracer (PID=%d)\n",
 	    child, getpid());
 	ATF_REQUIRE(ptrace(PT_IO, child, &io, 0) != -1);
 	ATF_REQUIRE_EQ_MSG(lookup_me, magic,
 	    "got value %" PRIx8 " != expected %" PRIx8, lookup_me, magic);
 @@ -4671,1032 +4738,1034 @@ ATF_TC_BODY(kill2, tc)
 	ATF_REQUIRE(ptrace(PT_KILL, 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_signaled(status, SIGKILL, 0);
 	printf("Before calling %s() for the child\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 ATF_TC(lwpinfo1);
 ATF_TC_HEAD(lwpinfo1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify basic LWPINFO call for single thread (PT_TRACE_ME)");
+}
 ATF_TC_BODY(lwpinfo1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	struct ptrace_lwpinfo info = {0, 0};
 	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("Before calling ptrace(2) with PT_LWPINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_LWPINFO, child, &info, sizeof(info)) != -1);
 	printf("Assert that there exists a thread\n");
 	ATF_REQUIRE(info.pl_lwpid > 0);
 	printf("Assert that lwp thread %d received event PL_EVENT_SIGNAL\n",
 	    info.pl_lwpid);
 	ATF_REQUIRE_EQ_MSG(info.pl_event, PL_EVENT_SIGNAL,
 	    "Received event %d != expected event %d",
 	    info.pl_event, PL_EVENT_SIGNAL);
 	printf("Before calling ptrace(2) with PT_LWPINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_LWPINFO, child, &info, sizeof(info)) != -1);
 	printf("Assert that there are no more lwp threads in child\n");
 	ATF_REQUIRE_EQ(info.pl_lwpid, 0);
 	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));
+}
 #if defined(TWAIT_HAVE_PID)
 ATF_TC(lwpinfo2);
 ATF_TC_HEAD(lwpinfo2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify basic LWPINFO call for single thread (PT_ATTACH from "
 	    "tracer)");
+}
 ATF_TC_BODY(lwpinfo2, tc)
+{
 	struct msg_fds parent_tracee, parent_tracer;
 	const int exitval_tracee = 5;
 	const int exitval_tracer = 10;
 	pid_t tracee, tracer, wpid;
 	uint8_t msg = 0xde; /* dummy message for IPC based on pipe(2) */
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	struct ptrace_lwpinfo info = {0, 0};
 	printf("Spawn tracee\n");
 	ATF_REQUIRE(msg_open(&parent_tracee) == 0);
 	ATF_REQUIRE(msg_open(&parent_tracer) == 0);
 	tracee = atf_utils_fork();
 	if (tracee == 0) {
 		/* Wait for message from the parent */
 		CHILD_TO_PARENT("tracee ready", parent_tracee, msg);
 		CHILD_FROM_PARENT("tracee exit", parent_tracee, msg);
 		_exit(exitval_tracee);
+	}
 	PARENT_FROM_CHILD("tracee ready", parent_tracee, msg);
 	printf("Spawn debugger\n");
 	tracer = atf_utils_fork();
 	if (tracer == 0) {
 		/* No IPC to communicate with the child */
 		printf("Before calling PT_ATTACH from tracee %d\n", getpid());
 		FORKEE_ASSERT(ptrace(PT_ATTACH, tracee, NULL, 0) != -1);
 		/* Wait for tracee and assert that it was stopped w/ SIGSTOP */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_stopped(status, SIGSTOP);
 		printf("Before calling ptrace(2) with PT_LWPINFO for child\n");
 		FORKEE_ASSERT(ptrace(PT_LWPINFO, tracee, &info, sizeof(info))
 		    != -1);
 		printf("Assert that there exists a thread\n");
 		FORKEE_ASSERTX(info.pl_lwpid > 0);
 		printf("Assert that lwp thread %d received event "
 		    "PL_EVENT_SIGNAL\n", info.pl_lwpid);
 		FORKEE_ASSERT_EQ(info.pl_event, PL_EVENT_SIGNAL);
 		printf("Before calling ptrace(2) with PT_LWPINFO for child\n");
 		FORKEE_ASSERT(ptrace(PT_LWPINFO, tracee, &info, sizeof(info))
 		    != -1);
 		printf("Assert that there are no more lwp threads in child\n");
 		FORKEE_ASSERTX(info.pl_lwpid == 0);
 		/* Resume tracee with PT_CONTINUE */
 		FORKEE_ASSERT(ptrace(PT_CONTINUE, tracee, (void *)1, 0) != -1);
 		/* Inform parent that tracer has attached to tracee */
 		CHILD_TO_PARENT("tracer ready", parent_tracer, msg);
 		/* Wait for parent */
 		CHILD_FROM_PARENT("tracer wait", parent_tracer, msg);
 		/* Wait for tracee and assert that it exited */
 		FORKEE_REQUIRE_SUCCESS(
 		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 		forkee_status_exited(status, exitval_tracee);
 		printf("Before exiting of the tracer process\n");
 		_exit(exitval_tracer);
+	}
 	printf("Wait for the tracer to attach to the tracee\n");
 	PARENT_FROM_CHILD("tracer ready", parent_tracer, msg);
 	printf("Resume the tracee and let it exit\n");
 	PARENT_TO_CHILD("tracee exit", parent_tracee, msg);
 	printf("Detect that tracee is zombie\n");
 	await_zombie(tracee);
 	printf("Assert that there is no status about tracee - "
 	    "Tracer must detect zombie first - calling %s()\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(
 	    wpid = TWAIT_GENERIC(tracee, &status, WNOHANG), 0);
 	printf("Resume the tracer and let it detect exited tracee\n");
 	PARENT_TO_CHILD("tracer wait", parent_tracer, msg);
 	printf("Wait for tracer to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracer, &status, 0),
 	    tracer);
 	validate_status_exited(status, exitval_tracer);
 	printf("Wait for tracee to finish its job and exit - calling %s()\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracee, &status, WNOHANG),
 	    tracee);
 	validate_status_exited(status, exitval_tracee);
 	msg_close(&parent_tracer);
 	msg_close(&parent_tracee);
+}
 #endif
 ATF_TC(siginfo1);
 ATF_TC_HEAD(siginfo1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify basic PT_GET_SIGINFO call for SIGTRAP from tracee");
+}
 ATF_TC_BODY(siginfo1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGTRAP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	struct ptrace_siginfo info;
 	memset(&info, 0, sizeof(info));
 	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("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	printf("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);
 	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(siginfo2);
 ATF_TC_HEAD(siginfo2, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify basic PT_GET_SIGINFO and PT_SET_SIGINFO calls without "
 	    "modification of SIGINT from tracee");
+}
 static int siginfo2_caught = 0;
 static void
 siginfo2_sighandler(int sig)
+{
 	FORKEE_ASSERT_EQ(sig, SIGINT);
 	++siginfo2_caught;
+}
 ATF_TC_BODY(siginfo2, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGINT;
 	pid_t child, wpid;
 	struct sigaction sa;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	struct ptrace_siginfo info;
 	memset(&info, 0, sizeof(info));
 	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);
 		sa.sa_handler = siginfo2_sighandler;
 		sa.sa_flags = SA_SIGINFO;
 		sigemptyset(&sa.sa_mask);
 		FORKEE_ASSERT(sigaction(sigval, &sa, NULL) != -1);
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		FORKEE_ASSERT_EQ(siginfo2_caught, 1);
 		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("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	printf("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);
 	printf("Before calling ptrace(2) with PT_SET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_SET_SIGINFO, child, &info, sizeof(info)) != -1);
 	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, sigval) != -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(siginfo3);
 ATF_TC_HEAD(siginfo3, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify basic PT_GET_SIGINFO and PT_SET_SIGINFO calls with "
 	    "setting signal to new value");
+}
 static int siginfo3_caught = 0;
 static void
 siginfo3_sigaction(int sig, siginfo_t *info, void *ctx)
+{
 	FORKEE_ASSERT_EQ(sig, SIGTRAP);
 	FORKEE_ASSERT_EQ(info->si_signo, SIGTRAP);
 	FORKEE_ASSERT_EQ(info->si_code, TRAP_BRKPT);
 	++siginfo3_caught;
+}
 ATF_TC_BODY(siginfo3, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGINT;
 	const int sigfaked = SIGTRAP;
 	const int sicodefaked = TRAP_BRKPT;
 	pid_t child, wpid;
 	struct sigaction sa;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	struct ptrace_siginfo info;
 	memset(&info, 0, sizeof(info));
 	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);
 		sa.sa_sigaction = siginfo3_sigaction;
 		sa.sa_flags = SA_SIGINFO;
 		sigemptyset(&sa.sa_mask);
 		FORKEE_ASSERT(sigaction(sigfaked, &sa, NULL) != -1);
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		FORKEE_ASSERT_EQ(siginfo3_caught, 1);
 		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("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	printf("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);
 	printf("Before setting new faked signal to signo=%d si_code=%d\n",
 	    sigfaked, sicodefaked);
 	info.psi_siginfo.si_signo = sigfaked;
 	info.psi_siginfo.si_code = sicodefaked;
 	printf("Before calling ptrace(2) with PT_SET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_SET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigfaked);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, sicodefaked);
 	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, sigfaked) != -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(siginfo4);
 ATF_TC_HEAD(siginfo4, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Detect SIGTRAP TRAP_EXEC from tracee");
+}
 ATF_TC_BODY(siginfo4, tc)
+{
 	const int sigval = SIGTRAP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	struct ptrace_siginfo info;
 	memset(&info, 0, sizeof(info));
 	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 calling execve(2) from child\n");
 		execlp("/bin/echo", "/bin/echo", NULL);
 		FORKEE_ASSERT(0 && "Not reached");
+	}
 	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("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	printf("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, TRAP_EXEC);
 	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);
 	printf("Before calling %s() for the child\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 #if defined(TWAIT_HAVE_PID)
 ATF_TC(siginfo5);
 ATF_TC_HEAD(siginfo5, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that fork(2) is intercepted by ptrace(2) with EVENT_MASK "
 	    "set to PTRACE_FORK and reports correct signal information");
+}
 ATF_TC_BODY(siginfo5, tc)
+{
 	const int exitval = 5;
 	const int exitval2 = 15;
 	const int sigval = SIGSTOP;
 	pid_t child, child2, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_state_t state;
 	const int slen = sizeof(state);
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 	struct ptrace_siginfo info;
 	memset(&info, 0, sizeof(info));
 	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);
 		FORKEE_ASSERT((child2 = fork()) != 1);
 		if (child2 == 0)
 			_exit(exitval2);
 		FORKEE_REQUIRE_SUCCESS
 		    (wpid = TWAIT_GENERIC(child2, &status, 0), child2);
 		forkee_status_exited(status, exitval2);
 		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("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SI_LWP);
 	printf("Enable PTRACE_FORK in EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = PTRACE_FORK;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
 	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 %d\n", TWAIT_FNAME, child);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGTRAP);
 	printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_CHLD);
 	ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_FORK);
 	child2 = state.pe_other_pid;
 	printf("Reported PTRACE_FORK event with forkee %d\n", child2);
 	printf("Before calling %s() for the forkee %d of the child %d\n",
 	    TWAIT_FNAME, child2, child);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0),
 	    child2);
 	validate_status_stopped(status, SIGTRAP);
 	printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_CHLD);
 	ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child2, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_FORK);
 	ATF_REQUIRE_EQ(state.pe_other_pid, child);
 	printf("Before resuming the forkee process where it left off and "
 	    "without signal to be sent\n");
 	ATF_REQUIRE(ptrace(PT_CONTINUE, child2, (void *)1, 0) != -1);
 	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 forkee - expected exited\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0),
 	    child2);
 	validate_status_exited(status, exitval2);
 	printf("Before calling %s() for the forkee - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD,
 	    wpid = TWAIT_GENERIC(child2, &status, 0));
 	printf("Before calling %s() for the child - expected stopped "
 	    "SIGCHLD\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGCHLD);
 	printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGCHLD);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, CLD_EXITED);
 	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 - expected exited\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 - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 #endif
 #if defined(PT_STEP)
 ATF_TC(siginfo6);
 ATF_TC_HEAD(siginfo6, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify single PT_STEP call with signal information check");
+}
 ATF_TC_BODY(siginfo6, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	int happy;
 	struct ptrace_siginfo info;
 	memset(&info, 0, sizeof(info));
 	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);
 		happy = check_happy(100);
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		FORKEE_ASSERT_EQ(happy, check_happy(100));
 		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("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SI_LWP);
 	printf("Before resuming the child process where it left off and "
 	    "without signal to be sent (use PT_STEP)\n");
 	ATF_REQUIRE(ptrace(PT_STEP, 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_stopped(status, SIGTRAP);
 	printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
 	ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 	printf("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_TRACE);
 	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
 volatile lwpid_t the_lwp_id = 0;
 static void
 lwp_main_func(void *arg)
+{
 	the_lwp_id = _lwp_self();
 	_lwp_exit();
+}
 ATF_TC(lwp_create1);
 ATF_TC_HEAD(lwp_create1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that 1 LWP creation is intercepted by ptrace(2) with "
 	    "EVENT_MASK set to PTRACE_LWP_CREATE");
+}
 ATF_TC_BODY(lwp_create1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_state_t state;
 	const int slen = sizeof(state);
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 	ucontext_t uc;
 	lwpid_t lid;
 	static const size_t ssize = 16*1024;
 	void *stack;
 	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 allocating memory for stack in child\n");
 		FORKEE_ASSERT((stack = malloc(ssize)) != NULL);
 		printf("Before making context for new lwp in child\n");
 		_lwp_makecontext(&uc, lwp_main_func, NULL, NULL, stack, ssize);
 		printf("Before creating new in child\n");
 		FORKEE_ASSERT(_lwp_create(&uc, 0, &lid) == 0);
 		printf("Before waiting for lwp %d to exit\n", lid);
 		FORKEE_ASSERT(_lwp_wait(lid, NULL) == 0);
 		printf("Before verifying that reported %d and running lid %d "
 		    "are the same\n", lid, the_lwp_id);
 		FORKEE_ASSERT_EQ(lid, the_lwp_id);
 		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("Set empty EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = PTRACE_LWP_CREATE;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
 	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 - expected stopped "
 	    "SIGTRAP\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGTRAP);
 	ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_LWP_CREATE);
 	lid = state.pe_lwp;
 	printf("Reported PTRACE_LWP_CREATE event with lid %d\n", lid);
 	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 - expected exited\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 - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 ATF_TC(lwp_exit1);
 ATF_TC_HEAD(lwp_exit1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that 1 LWP creation is intercepted by ptrace(2) with "
 	    "EVENT_MASK set to PTRACE_LWP_EXIT");
+}
 ATF_TC_BODY(lwp_exit1, tc)
+{
 	const int exitval = 5;
 	const int sigval = SIGSTOP;
 	pid_t child, wpid;
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
 	ptrace_state_t state;
 	const int slen = sizeof(state);
 	ptrace_event_t event;
 	const int elen = sizeof(event);
 	ucontext_t uc;
 	lwpid_t lid;
 	static const size_t ssize = 16*1024;
 	void *stack;
 	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 allocating memory for stack in child\n");
 		FORKEE_ASSERT((stack = malloc(ssize)) != NULL);
 		printf("Before making context for new lwp in child\n");
 		_lwp_makecontext(&uc, lwp_main_func, NULL, NULL, stack, ssize);
 		printf("Before creating new in child\n");
 		FORKEE_ASSERT(_lwp_create(&uc, 0, &lid) == 0);
 		printf("Before waiting for lwp %d to exit\n", lid);
 		FORKEE_ASSERT(_lwp_wait(lid, NULL) == 0);
 		printf("Before verifying that reported %d and running lid %d "
 		    "are the same\n", lid, the_lwp_id);
 		FORKEE_ASSERT_EQ(lid, the_lwp_id);
 		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("Set empty EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = PTRACE_LWP_EXIT;
 	ATF_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
 	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 - expected stopped "
 	    "SIGTRAP\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
 	validate_status_stopped(status, SIGTRAP);
 	ATF_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_LWP_EXIT);
 	lid = state.pe_lwp;
 	printf("Reported PTRACE_LWP_EXIT event with lid %d\n", lid);
 	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 - expected exited\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 - expected no process\n",
 	    TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
 ATF_TP_ADD_TCS(tp)
+{
 	setvbuf(stdout, NULL, _IONBF, 0);
 	setvbuf(stderr, NULL, _IONBF, 0);
 	ATF_TP_ADD_TC(tp, traceme1);
 	ATF_TP_ADD_TC(tp, traceme2);
 	ATF_TP_ADD_TC(tp, traceme3);
 	ATF_TP_ADD_TC(tp, traceme4);
 	ATF_TP_ADD_TC_HAVE_PID(tp, attach1);
 	ATF_TP_ADD_TC_HAVE_PID(tp, attach2);
 	ATF_TP_ADD_TC(tp, attach3);
 	ATF_TP_ADD_TC(tp, attach4);
 	ATF_TP_ADD_TC_HAVE_PID(tp, attach5);
 	ATF_TP_ADD_TC_HAVE_PID(tp, attach6);
 	ATF_TP_ADD_TC_HAVE_PID(tp, attach7);
 	ATF_TP_ADD_TC(tp, eventmask1);
 	ATF_TP_ADD_TC(tp, eventmask2);
 	ATF_TP_ADD_TC(tp, eventmask3);
 	ATF_TP_ADD_TC(tp, eventmask4);
 	ATF_TP_ADD_TC(tp, eventmask5);
 	ATF_TP_ADD_TC(tp, eventmask6);
 	ATF_TP_ADD_TC_HAVE_PID(tp, fork1);
 	ATF_TP_ADD_TC(tp, fork2);
 	ATF_TP_ADD_TC_HAVE_PID(tp, vfork1);
 	ATF_TP_ADD_TC(tp, vfork2);
 	ATF_TP_ADD_TC(tp, vforkdone1);
 	ATF_TP_ADD_TC(tp, vforkdone2);
 	ATF_TP_ADD_TC(tp, io_read_d1);
 	ATF_TP_ADD_TC(tp, io_read_d2);
 	ATF_TP_ADD_TC(tp, io_read_d3);
 	ATF_TP_ADD_TC(tp, io_read_d4);
 	ATF_TP_ADD_TC(tp, io_write_d1);
 	ATF_TP_ADD_TC(tp, io_write_d2);
 	ATF_TP_ADD_TC(tp, io_write_d3);
 	ATF_TP_ADD_TC(tp, io_write_d4);
 	ATF_TP_ADD_TC(tp, read_d1);
 	ATF_TP_ADD_TC(tp, read_d2);
 	ATF_TP_ADD_TC(tp, read_d3);
 	ATF_TP_ADD_TC(tp, read_d4);
 	ATF_TP_ADD_TC(tp, write_d1);
 	ATF_TP_ADD_TC(tp, write_d2);
 	ATF_TP_ADD_TC(tp, write_d3);
 	ATF_TP_ADD_TC(tp, write_d4);
 	ATF_TP_ADD_TC(tp, io_read_d_write_d_handshake1);
 	ATF_TP_ADD_TC(tp, io_read_d_write_d_handshake2);
 	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);
 	ATF_TP_ADD_TC(tp, kill1);
 	ATF_TP_ADD_TC(tp, kill2);
 	ATF_TP_ADD_TC(tp, lwpinfo1);
 	ATF_TP_ADD_TC_HAVE_PID(tp, lwpinfo2);
 	ATF_TP_ADD_TC(tp, siginfo1);
 	ATF_TP_ADD_TC(tp, siginfo2);
 	ATF_TP_ADD_TC(tp, siginfo3);
 	ATF_TP_ADD_TC(tp, siginfo4);
 	ATF_TP_ADD_TC_HAVE_PID(tp, siginfo5);
 	ATF_TP_ADD_TC_PT_STEP(tp, siginfo6);
 	ATF_TP_ADD_TC(tp, lwp_create1);
 	ATF_TP_ADD_TC(tp, lwp_exit1);
 	return atf_no_error();
+}