[src/trunk]: src/tests/lib/libc/sys Minor changes to t_ptrace_wait*

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

details:   https://anonhg.NetBSD.org/src/rev/404a876ec271
branches:  trunk
changeset: 745012:404a876ec271
user:      kamil <kamil%NetBSD.org@localhost>
date:      Thu Feb 20 22:38:54 2020 +0000

description:
Minor changes to t_ptrace_wait*

Add check for security.models.extensions.user_set_dbregs in the
concurrent event tests.

Use unconditionally atf_tc_skip(); as the test is racy.

diffstat:

 tests/lib/libc/sys/t_ptrace_wait.c |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 37dd73b7c323 -r 404a876ec271 tests/lib/libc/sys/t_ptrace_wait.c
--- a/tests/lib/libc/sys/t_ptrace_wait.c        Thu Feb 20 21:14:23 2020 +0000
+++ b/tests/lib/libc/sys/t_ptrace_wait.c        Thu Feb 20 22:38:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_ptrace_wait.c,v 1.163 2020/02/19 17:13:00 kamil Exp $        */
+/*     $NetBSD: t_ptrace_wait.c,v 1.164 2020/02/20 22:38:54 kamil Exp $        */
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.163 2020/02/19 17:13:00 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.164 2020/02/20 22:38:54 kamil Exp $");
 
 #define __LEGACY_PT_LWPINFO
 
@@ -2488,6 +2488,7 @@
 ATF_TC(tracer_sysctl_lookup_without_duplicates);
 ATF_TC_HEAD(tracer_sysctl_lookup_without_duplicates, tc)
 {
+       atf_tc_set_md_var(tc, "timeout", "15");
        atf_tc_set_md_var(tc, "descr",
            "Assert that await_zombie() in attach1 always finds a single "
            "process and no other error is reported");
@@ -7541,6 +7542,8 @@
        TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
+/// ----------------------------------------------------------------------------
+
 ATF_TC(syscallemu1);
 ATF_TC_HEAD(syscallemu1, tc)
 {
@@ -8728,10 +8731,14 @@
        ptrace_event_t event;
        int i;
 
-       if (signal_handle == TCSH_SIG_IGN)
-               atf_tc_expect_fail("PR kern/54960");
-       else if (signal_handle == TCSH_HANDLER)
-               atf_tc_skip("PR kern/54960");
+#if defined(HAVE_DBREGS)
+       if (!can_we_set_dbregs()) {
+               atf_tc_skip("Either run this test as root or set sysctl(3) "
+                           "security.models.extensions.user_set_dbregs to 1");
+        }
+#endif
+
+       atf_tc_skip("PR kern/54960");
 
        /* Protect against out-of-bounds array access. */
        ATF_REQUIRE(breakpoint_threads <= THREAD_CONCURRENT_BREAKPOINT_NUM);