From a59fdf004b6a7f63d1953a569fff8f0a6a2bb0da Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 8 Aug 2018 18:54:05 +0000
Subject: [PATCH] MFC r323620:

  Fix the raise tests.


git-svn-id: svn://svn.freebsd.org/base/stable/10@337486 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 .../opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c | 4 ++--
 .../opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d | 3 ++-
 .../opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c | 2 +-
 .../opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d | 3 ++-
 .../opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c | 2 +-
 .../opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d | 3 ++-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
index e39108366..8dd7bb972 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
@@ -35,13 +35,13 @@ main(int argc, char **argv)
 	sigset_t ss;
 
 	(void) sigemptyset(&ss);
-	(void) sigaddset(&ss, SIGINT);
+	(void) sigaddset(&ss, SIGUSR1);
 	(void) sigprocmask(SIG_BLOCK, &ss, NULL);
 
 	do {
 		(void) getpid();
 		(void) sigpending(&ss);
-	} while (!sigismember(&ss, SIGINT));
+	} while (!sigismember(&ss, SIGUSR1));
 
 	return (0);
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
index cdc715475..30bf5ae4b 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
@@ -47,7 +47,7 @@ syscall::getpid:entry
 /pid == $1/
 {
 	trace("raised");
-	raise(SIGINT);
+	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
@@ -55,6 +55,7 @@ syscall::getpid:entry
 }
 
 syscall::exit:entry
+/pid == $1/
 {
 	exit(0);
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
index 9089283f7..3901d9862 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
@@ -45,7 +45,7 @@ main(int argc, char **argv)
 	sigemptyset(&sa.sa_mask);
 	sa.sa_flags = 0;
 
-	(void) sigaction(SIGINT, &sa, NULL);
+	(void) sigaction(SIGUSR1, &sa, NULL);
 
 	for (;;) {
 		(void) getpid();
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
index 4f68a0b93..7d18442d7 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
@@ -47,7 +47,7 @@ syscall::getpid:return
 /pid == $1/
 {
 	trace("raised");
-	raise(SIGINT);
+	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
@@ -55,6 +55,7 @@ syscall::getpid:return
 }
 
 syscall::exit:entry
+/pid == $1/
 {
 	exit(0);
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
index 9089283f7..3901d9862 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
@@ -45,7 +45,7 @@ main(int argc, char **argv)
 	sigemptyset(&sa.sa_mask);
 	sa.sa_flags = 0;
 
-	(void) sigaction(SIGINT, &sa, NULL);
+	(void) sigaction(SIGUSR1, &sa, NULL);
 
 	for (;;) {
 		(void) getpid();
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
index cdc715475..30bf5ae4b 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
@@ -47,7 +47,7 @@ syscall::getpid:entry
 /pid == $1/
 {
 	trace("raised");
-	raise(SIGINT);
+	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
@@ -55,6 +55,7 @@ syscall::getpid:entry
 }
 
 syscall::exit:entry
+/pid == $1/
 {
 	exit(0);
 }
-- 
2.45.0