From owner-svn-src-all@freebsd.org Wed Aug 8 18:53:36 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C05851067263; Wed, 8 Aug 2018 18:53:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 779968D80B; Wed, 8 Aug 2018 18:53:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A32F699C; Wed, 8 Aug 2018 18:53:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w78Ira10044675; Wed, 8 Aug 2018 18:53:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w78IrZKt044670; Wed, 8 Aug 2018 18:53:35 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201808081853.w78IrZKt044670@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 8 Aug 2018 18:53:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r337485 - stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise X-SVN-Group: stable-11 X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise X-SVN-Commit-Revision: 337485 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2018 18:53:37 -0000 Author: bdrewery Date: Wed Aug 8 18:53:34 2018 New Revision: 337485 URL: https://svnweb.freebsd.org/changeset/base/337485 Log: MFC r323620: Fix the raise tests. Modified: stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c Wed Aug 8 18:52:37 2018 (r337484) +++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c Wed Aug 8 18:53:34 2018 (r337485) @@ -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/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d Wed Aug 8 18:52:37 2018 (r337484) +++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d Wed Aug 8 18:53:34 2018 (r337485) @@ -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/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c Wed Aug 8 18:52:37 2018 (r337484) +++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c Wed Aug 8 18:53:34 2018 (r337485) @@ -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/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d Wed Aug 8 18:52:37 2018 (r337484) +++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d Wed Aug 8 18:53:34 2018 (r337485) @@ -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/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c Wed Aug 8 18:52:37 2018 (r337484) +++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c Wed Aug 8 18:53:34 2018 (r337485) @@ -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/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d Wed Aug 8 18:52:37 2018 (r337484) +++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d Wed Aug 8 18:53:34 2018 (r337485) @@ -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); }