From 0646c22afc751507b7ffd842f46823f73bfa4145 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 31 Dec 2013 15:45:12 +0000
Subject: [PATCH] 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.

---
 tools/test/dtrace/Makefile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/test/dtrace/Makefile b/tools/test/dtrace/Makefile
index fc8af340658..bf3e787ffc3 100644
--- a/tools/test/dtrace/Makefile
+++ b/tools/test/dtrace/Makefile
@@ -297,6 +297,8 @@ ${_d}_TSTD!=	find ${TESTSRCDIR}/tst/common/${_d} -name "tst.*.d"
 ${_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}