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}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
