 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.15 2016/11/15 02:53:32 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.16 2016/11/15 19:30:28 kamil Exp $	*/
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``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.15 2016/11/15 02:53:32 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.16 2016/11/15 19:30:28 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 <err.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 @@ -1588,40 +1588,166 @@ ATF_TC_BODY(eventmask2, tc)
 	    "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(fork1);
 ATF_TC_HEAD(fork1, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Verify that fork(2) is intercepted by ptrace(2) with EVENT_MASK "
 	    "set to PTRACE_FORK");
+}
 ATF_TC_BODY(fork1, 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());
 	child = atf_utils_fork();
 	if (child == 0) {
 		printf("Before calling PT_TRACE_ME from child %d\n", getpid());
 		FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
 		printf("Before raising %s from child\n", strsignal(sigval));
 		FORKEE_ASSERT(raise(sigval) == 0);
 		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("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);
 	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);
 	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 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(TWAIT_HAVE_PID)
 #define ATF_TP_ADD_TC_HAVE_PID(a,b)	ATF_TP_ADD_TC(a,b)
 #else
 #define ATF_TP_ADD_TC_HAVE_PID(a,b)
 #endif
 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_HAVE_PID(tp, fork1);
 	return atf_no_error();
+}