Author: bdrewery
Date: Wed Aug 8 18:54:05 2018
New Revision: 337486
URL: https://svnweb.freebsd.org/changeset/base/337486
Log:
MFC r323620:
Fix the raise tests.
Modified:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
Directory Properties:
stable/10/ (props changed)
Modified:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
==============================================================================
---
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
Wed Aug 8 18:53:34 2018 (r337485)
+++
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
Wed Aug 8 18:54:05 2018 (r337486)
@@ -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);
}
Modified:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
==============================================================================
---
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
Wed Aug 8 18:53:34 2018 (r337485)
+++
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
Wed Aug 8 18:54:05 2018 (r337486)
@@ -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);
}
Modified:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
==============================================================================
---
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
Wed Aug 8 18:53:34 2018 (r337485)
+++
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
Wed Aug 8 18:54:05 2018 (r337486)
@@ -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();
Modified:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
==============================================================================
---
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
Wed Aug 8 18:53:34 2018 (r337485)
+++
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
Wed Aug 8 18:54:05 2018 (r337486)
@@ -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);
}
Modified:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
==============================================================================
---
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
Wed Aug 8 18:53:34 2018 (r337485)
+++
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
Wed Aug 8 18:54:05 2018 (r337486)
@@ -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();
Modified:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
==============================================================================
---
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
Wed Aug 8 18:53:34 2018 (r337485)
+++
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
Wed Aug 8 18:54:05 2018 (r337486)
@@ -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);
}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
