[src/trunk]: src/tests/lib/libc/sys Refactor and enable the sign...

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/db066ef6e026
branches:  trunk
changeset: 319205:db066ef6e026
user:      kamil <kamil%NetBSD.org@localhost>
date:      Sun May 20 23:47:16 2018 +0000

description:
Refactor and enable the signal3 ATF ptrace(2) test

Adapt the test to be independent from the software breakpoint trap
behavior, whether the Program Counter is moved or not. Just kill the
process after catching the expected signal, instead of pretending to resume
it.

This test passes.

Sponsored by <The NetBSD Foundation>

diffstat:

 tests/lib/libc/sys/t_ptrace_wait.c |  28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

diffs (56 lines):

diff -r dd2135546791 -r db066ef6e026 tests/lib/libc/sys/t_ptrace_wait.c
--- a/tests/lib/libc/sys/t_ptrace_wait.c        Sun May 20 15:28:27 2018 +0000
+++ b/tests/lib/libc/sys/t_ptrace_wait.c        Sun May 20 23:47:16 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_ptrace_wait.c,v 1.48 2018/05/20 03:51:31 kamil Exp $ */
+/*     $NetBSD: t_ptrace_wait.c,v 1.49 2018/05/20 23:47:16 kamil Exp $ */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.48 2018/05/20 03:51:31 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.49 2018/05/20 23:47:16 kamil Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -5786,18 +5786,6 @@
 #endif
        sigset_t intmask;
 
-       atf_tc_expect_fail("PR kern/51918");
-
-       // This test breaks now on some ports, temporarily disable it
-       ATF_REQUIRE(0 && "In order to get reliable failure, abort");
-
-#if defined(__sparc__)
-       atf_tc_expect_timeout("PR kern/52167");
-
-       // timeout wins, failure still valid
-       // atf_tc_expect_fail("PR kern/51918");
-#endif
-
        DPRINTF("Before forking process PID=%d\n", getpid());
        SYSCALL_REQUIRE((child = fork()) != -1);
        if (child == 0) {
@@ -5840,12 +5828,12 @@
 
        DPRINTF("Before resuming the child process where it left off and "
            "without signal to be sent\n");
-       SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
-
-       DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
-       TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
-
-       validate_status_exited(status, exitval);
+       SYSCALL_REQUIRE(ptrace(PT_KILL, child, NULL, 0) != -1);
+
+       DPRINTF("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);
 
        DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
        TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));