From owner-svn-src-all@FreeBSD.ORG Tue Dec 31 15:45:12 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5E63D80; Tue, 31 Dec 2013 15:45:12 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 91ED31AF6; Tue, 31 Dec 2013 15:45:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBVFjCpG060065; Tue, 31 Dec 2013 15:45:12 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBVFjC8V060064; Tue, 31 Dec 2013 15:45:12 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201312311545.rBVFjC8V060064@svn.freebsd.org> From: Mark Johnston Date: Tue, 31 Dec 2013 15:45:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260133 - head/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-all@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 31 Dec 2013 15:45:12 -0000 Author: markj Date: Tue Dec 31 15:45:12 2013 New Revision: 260133 URL: http://svnweb.freebsd.org/changeset/base/260133 Log: Some DTrace tests (mostly in the pid provider directory) make use of executable ksh scripts. These are currently not copied into the test directory the way that compiled executables are, so the tests which make use of them cannot work. This changes the test Makefile to copy the scripts into the test directory. Modified: head/tools/test/dtrace/Makefile Modified: head/tools/test/dtrace/Makefile ============================================================================== --- head/tools/test/dtrace/Makefile Tue Dec 31 15:41:16 2013 (r260132) +++ head/tools/test/dtrace/Makefile Tue Dec 31 15:45:12 2013 (r260133) @@ -297,6 +297,8 @@ ${_d}_TSTD!= find ${TESTSRCDIR}/tst/comm ${_d}_TSTC!= find ${TESTSRCDIR}/tst/common/${_d} -name "tst.*.c" ${_d}_SHERR!= find ${TESTSRCDIR}/tst/common/${_d} -name "err.*.ksh" ${_d}_SHTST!= find ${TESTSRCDIR}/tst/common/${_d} -name "tst.*.ksh" +${_d}_EXE!= find ${TESTSRCDIR}/tst/common/${_d} -name "tst.*.exe" -o \ + -name "err.*.exe" ${_d}_TF= ${${_d}_ERR} ${${_d}_TSTD} ${${_d}_SHERR} ${${_d}_SHTST} # Go through the list of test files and prepare another list that contains @@ -317,15 +319,16 @@ ${_d}_TFCS+= ${_f} .endfor ALL_TESTCFILES+= ${${_d}_TFCS} +ALL_TESTEXEFILES+= ${${_d}_EXE} -${_d} : ${${_d}_TFCS:T:S/c$/exe/} +${_d} : ${${_d}_TFCS:T:S/c$/exe/} ${${_d}_EXE:T} @${DTEST} ${${_d}_TFS} .endfor # -------------------------------------------------------------------------------- # -PRGS= ${ALL_TESTCFILES:T:S/c$/exe/} +PRGS= ${ALL_TESTCFILES:T:S/c$/exe/} ${ALL_TESTEXEFILES:T} listprgs : @echo ${PRGS} @@ -338,6 +341,12 @@ ${_f:T:S/c$/exe/} : ${_f} gcc -o ${.TARGET} ${_f} -lrt .endfor +.for _f in ${ALL_TESTEXEFILES} +${_f:T} : ${_f} + cp -f ${_f} ${.TARGET} + chmod a+x ${.TARGET} +.endfor + listcfiles : @echo ${ALL_TESTCFILES}