 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.3 2016/11/11 12:01:14 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.4 2016/11/11 17:08:54 christos 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.3 2016/11/11 12:01:14 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.4 2016/11/11 17:08:54 christos Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 @@ -193,27 +193,28 @@ do {										\
 /*
  * Helper tools to verify whether status reports exited value
  */
 #if TWAIT_HAVE_STATUS
 static void __used
 validate_status_exited(int status, int expected)
+{
         ATF_REQUIRE_MSG(WIFEXITED(status), "Reported exited process");
         ATF_REQUIRE_MSG(!WIFCONTINUED(status), "Reported continued process");
         ATF_REQUIRE_MSG(!WIFSIGNALED(status), "Reported signaled process");
         ATF_REQUIRE_MSG(!WIFSTOPPED(status), "Reported stopped process");
 	ATF_REQUIRE_EQ_MSG(WEXITSTATUS(status), expected,
-	    "The process has exited with invalid value");
+	    "The process has exited with invalid value %d != %d",
 	    WEXITSTATUS(status), expected);
+}
 static void __used
 forkee_status_exited(int status, int expected)
+{
 	FORKEE_ASSERTX(WIFEXITED(status));
 	FORKEE_ASSERTX(!WIFCONTINUED(status));
 	FORKEE_ASSERTX(!WIFSIGNALED(status));
 	FORKEE_ASSERTX(!WIFSTOPPED(status));
 	FORKEE_ASSERTX(WEXITSTATUS(status) == expected);
+}
 @@ -260,28 +261,32 @@ forkee_status_signaled(int status, int e
 	FORKEE_ASSERTX(WTERMSIG(status) == expected_termsig);
 	FORKEE_ASSERTX(WCOREDUMP(status) == expected_core);
+}
 static void __used
 validate_status_stopped(int status, int expected)
+{
 	ATF_REQUIRE_MSG(!WIFEXITED(status), "Reported exited process");
 	ATF_REQUIRE_MSG(!WIFCONTINUED(status), "Reported continued process");
 	ATF_REQUIRE_MSG(!WIFSIGNALED(status), "Reported signaled process");
 	ATF_REQUIRE_MSG(WIFSTOPPED(status), "Reported stopped process");
 	char st[128], ex[128];
 	strlcpy(st, strsignal(WSTOPSIG(status)), sizeof(st));
 	strlcpy(ex, strsignal(expected), sizeof(ex));
 	ATF_REQUIRE_EQ_MSG(WSTOPSIG(status), expected,
-	    "Unexpected stop signal received");
+	    "Unexpected stop signal received [%s] != [%s]", st, ex);
+}
 static void __used
 forkee_status_stopped(int status, int expected)
+{
 	FORKEE_ASSERTX(!WIFEXITED(status));
 	FORKEE_ASSERTX(!WIFCONTINUED(status));
 	FORKEE_ASSERTX(!WIFSIGNALED(status));
 	FORKEE_ASSERTX(WIFSTOPPED(status));
 	FORKEE_ASSERTX(WSTOPSIG(status) == expected);
+}
 #else
 @@ -816,29 +821,26 @@ ATF_TC_HEAD(attach3, tc)
+}
 ATF_TC_BODY(attach3, tc)
+{
 	int fds_totracee[2], fds_fromtracee[2];
 	int rv;
 	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
 	/* PT_ATTACH from a parent is unreliable */
 	atf_tc_expect_fail("PR kern/51621");
 	printf("Spawn tracee\n");
 	ATF_REQUIRE(pipe(fds_totracee) == 0);
 	ATF_REQUIRE(pipe(fds_fromtracee) == 0);
 	tracee = atf_utils_fork();
 	if (tracee == 0) {
 		FORKEE_ASSERT(close(fds_totracee[1]) == 0);
 		FORKEE_ASSERT(close(fds_fromtracee[0]) == 0);
 		/* Wait for message from the parent */
 		rv = read(fds_totracee[0], &msg, sizeof(msg));
 		FORKEE_ASSERT(rv == sizeof(msg));
 		printf("Parent should now attach to tracee\n");