Module Name: src
Committed By: kamil
Date: Mon Jan 9 22:09:21 UTC 2017
Modified Files:
src/tests/kernel: t_ptrace_wait.c t_ptrace_wait.h
Log Message:
PT_GET_SIGINFO is no longer PT_SET_SIGINFO conditional in ATF tests
This interface is MI.
Sponsored by <The NetBSD Foundation>
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/tests/kernel/t_ptrace_wait.c
cvs rdiff -u -r1.6 -r1.7 src/tests/kernel/t_ptrace_wait.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.50 src/tests/kernel/t_ptrace_wait.c:1.51
--- src/tests/kernel/t_ptrace_wait.c:1.50 Fri Jan 6 22:40:06 2017
+++ src/tests/kernel/t_ptrace_wait.c Mon Jan 9 22:09:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.50 2017/01/06 22:40:06 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.51 2017/01/09 22:09:20 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.50 2017/01/06 22:40:06 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.51 2017/01/09 22:09:20 kamil Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -4458,7 +4458,6 @@ ATF_TC_BODY(lwpinfo2, tc)
}
#endif
-#if defined(HAVE_SIGINFO)
ATF_TC(siginfo1);
ATF_TC_HEAD(siginfo1, tc)
{
@@ -4516,9 +4515,7 @@ ATF_TC_BODY(siginfo1, tc)
printf("Before calling %s() for the child\n", TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
}
-#endif
-#if defined(HAVE_SIGINFO)
ATF_TC(siginfo2);
ATF_TC_HEAD(siginfo2, tc)
{
@@ -4599,9 +4596,7 @@ ATF_TC_BODY(siginfo2, tc)
printf("Before calling %s() for the child\n", TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
}
-#endif
-#if defined(HAVE_SIGINFO)
ATF_TC(siginfo3);
ATF_TC_HEAD(siginfo3, tc)
{
@@ -4699,9 +4694,7 @@ ATF_TC_BODY(siginfo3, tc)
printf("Before calling %s() for the child\n", TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
}
-#endif
-#if defined(HAVE_SIGINFO)
ATF_TC(siginfo4);
ATF_TC_HEAD(siginfo4, tc)
{
@@ -4759,7 +4752,6 @@ ATF_TC_BODY(siginfo4, tc)
printf("Before calling %s() for the child\n", TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
}
-#endif
ATF_TP_ADD_TCS(tp)
{
@@ -4843,10 +4835,10 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, lwpinfo1);
ATF_TP_ADD_TC_HAVE_PID(tp, lwpinfo2);
- ATF_TP_ADD_TC_HAVE_SIGINFO(tp, siginfo1);
- ATF_TP_ADD_TC_HAVE_SIGINFO(tp, siginfo2);
- ATF_TP_ADD_TC_HAVE_SIGINFO(tp, siginfo3);
- ATF_TP_ADD_TC_HAVE_SIGINFO(tp, siginfo4);
+ ATF_TP_ADD_TC(tp, siginfo1);
+ ATF_TP_ADD_TC(tp, siginfo2);
+ ATF_TP_ADD_TC(tp, siginfo3);
+ ATF_TP_ADD_TC(tp, siginfo4);
return atf_no_error();
}
Index: src/tests/kernel/t_ptrace_wait.h
diff -u src/tests/kernel/t_ptrace_wait.h:1.6 src/tests/kernel/t_ptrace_wait.h:1.7
--- src/tests/kernel/t_ptrace_wait.h:1.6 Wed Jan 4 22:27:20 2017
+++ src/tests/kernel/t_ptrace_wait.h Mon Jan 9 22:09:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.h,v 1.6 2017/01/04 22:27:20 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.h,v 1.7 2017/01/09 22:09:20 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -196,12 +196,6 @@ do { \
#define HAVE_DBREGS
#endif
-/* Add guards for siginfo_t accessors */
-#if defined(PT_GET_SIGINFO) \
- && defined(PT_SET_SIGINFO)
-#define HAVE_SIGINFO
-#endif
-
/*
* If waitid(2) returns because one or more processes have a state change to
* report, 0 is returned. If an error is detected, a value of -1 is returned
@@ -430,12 +424,6 @@ check_happy(unsigned n)
#define ATF_TP_ADD_TC_PT_STEP(a,b)
#endif
-#if defined(HAVE_SIGINFO)
-#define ATF_TP_ADD_TC_HAVE_SIGINFO(a,b) ATF_TP_ADD_TC(a,b)
-#else
-#define ATF_TP_ADD_TC_HAVE_SIGINFO(a,b)
-#endif
-
#if defined(__HAVE_PTRACE_WATCHPOINTS)
#define ATF_TP_ADD_TC_HAVE_PTRACE_WATCHPOINTS(a,b) ATF_TP_ADD_TC(a,b)
#else
