From owner-svn-src-head@FreeBSD.ORG Mon May 19 20:11:56 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7311D29E; Mon, 19 May 2014 20:11:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FD4B22DE; Mon, 19 May 2014 20:11:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JKBuBW005593; Mon, 19 May 2014 20:11:56 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JKBt9v005590; Mon, 19 May 2014 20:11:55 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201405192011.s4JKBt9v005590@svn.freebsd.org> From: Mark Johnston Date: Mon, 19 May 2014 20:11:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266454 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil tools/test/dtrace X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 20:11:56 -0000 Author: markj Date: Mon May 19 20:11:55 2014 New Revision: 266454 URL: http://svnweb.freebsd.org/changeset/base/266454 Log: Fix tst.ZeroModuleProbes.d.ksh, which was incorrectly modified in r178534. Since "BEGIN" is not the name of a module, the test would just hang. MFC after: 3 days Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh head/tools/test/dtrace/Makefile Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh Mon May 19 19:54:21 2014 (r266453) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh Mon May 19 20:11:55 2014 (r266454) @@ -46,7 +46,7 @@ fi dtrace=$1 $dtrace -qZm wassup'{printf("Iamkool");}' \ --qm BEGIN'{printf("I am done"); exit(0);}' +-qm kernel'{printf("I am done"); exit(0);}' status=$? Modified: head/tools/test/dtrace/Makefile ============================================================================== --- head/tools/test/dtrace/Makefile Mon May 19 19:54:21 2014 (r266453) +++ head/tools/test/dtrace/Makefile Mon May 19 20:11:55 2014 (r266454) @@ -188,7 +188,6 @@ NOTWORK+= \ # Tests that just don't complete (even to fail) at the moment... NOTWORK+= \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh \ ${TESTSRCDIR}/tst/common/printa/tst.many.d \ ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \