Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c	(revision 323619)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c	(revision 323620)
@@ -1,47 +1,47 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <unistd.h>
 #include <signal.h>
 
 int
 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);
 }
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d	(revision 323619)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d	(revision 323620)
@@ -1,67 +1,68 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION:
  * 	Positive test for raise
  *
  * SECTION: Actions and Subroutines/raise()
  */
 
 #pragma D option destructive
 
 BEGIN
 {
 	/*
 	 * Wait no more than a second for the process to call getpid().
 	 */
 	timeout = timestamp + 1000000000;
 }
 
 syscall::getpid:entry
 /pid == $1/
 {
 	trace("raised");
-	raise(SIGINT);
+	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
 	timeout = timestamp + 500000000;
 }
 
 syscall::exit:entry
+/pid == $1/
 {
 	exit(0);
 }
 
 profile:::tick-4
 /timestamp > timeout/
 {
 	trace("timed out");
 	exit(1);
 }
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c	(revision 323619)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c	(revision 323620)
@@ -1,53 +1,53 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <unistd.h>
 #include <signal.h>
 #include <stdlib.h>
 
 static void
 handle(int sig)
 {
 	exit(0);
 }
 
 int
 main(int argc, char **argv)
 {
 	struct sigaction sa;
 
 	sa.sa_handler = handle;
 	sigemptyset(&sa.sa_mask);
 	sa.sa_flags = 0;
 
-	(void) sigaction(SIGINT, &sa, NULL);
+	(void) sigaction(SIGUSR1, &sa, NULL);
 
 	for (;;) {
 		(void) getpid();
 	}
 }
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d	(revision 323619)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d	(revision 323620)
@@ -1,67 +1,68 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION:
  * 	Positive test for raise
  *
  * SECTION: Actions and Subroutines/raise()
  */
 
 #pragma D option destructive
 
 BEGIN
 {
 	/*
 	 * Wait no more than a second for the process to call getpid().
 	 */
 	timeout = timestamp + 1000000000;
 }
 
 syscall::getpid:return
 /pid == $1/
 {
 	trace("raised");
-	raise(SIGINT);
+	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
 	timeout = timestamp + 500000000;
 }
 
 syscall::exit:entry
+/pid == $1/
 {
 	exit(0);
 }
 
 profile:::tick-4
 /timestamp > timeout/
 {
 	trace("timed out");
 	exit(1);
 }
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c	(revision 323619)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c	(revision 323620)
@@ -1,53 +1,53 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <unistd.h>
 #include <signal.h>
 #include <stdlib.h>
 
 static void
 handle(int sig)
 {
 	exit(0);
 }
 
 int
 main(int argc, char **argv)
 {
 	struct sigaction sa;
 
 	sa.sa_handler = handle;
 	sigemptyset(&sa.sa_mask);
 	sa.sa_flags = 0;
 
-	(void) sigaction(SIGINT, &sa, NULL);
+	(void) sigaction(SIGUSR1, &sa, NULL);
 
 	for (;;) {
 		(void) getpid();
 	}
 }
Index: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
===================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d	(revision 323619)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d	(revision 323620)
@@ -1,67 +1,68 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION:
  * 	Positive test for raise
  *
  * SECTION: Actions and Subroutines/raise()
  */
 
 #pragma D option destructive
 
 BEGIN
 {
 	/*
 	 * Wait no more than a second for the process to call getpid().
 	 */
 	timeout = timestamp + 1000000000;
 }
 
 syscall::getpid:entry
 /pid == $1/
 {
 	trace("raised");
-	raise(SIGINT);
+	raise(SIGUSR1);
 	/*
 	 * Wait no more than half a second for the process to die.
 	 */
 	timeout = timestamp + 500000000;
 }
 
 syscall::exit:entry
+/pid == $1/
 {
 	exit(0);
 }
 
 profile:::tick-4
 /timestamp > timeout/
 {
 	trace("timed out");
 	exit(1);
 }