svn commit: r299037 - in user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests: . tools
Garrett Cooper
ngie at FreeBSD.org
Wed May 4 02:16:14 UTC 2016
Author: ngie
Date: Wed May 4 02:16:13 2016
New Revision: 299037
URL: https://svnweb.freebsd.org/changeset/base/299037
Log:
Use ${PACKAGE}FILES instead of TESTFILES
For some odd reason make was getting "lost" with the former idiom and wasn't
installing .d and .ksh scripts..
Modified:
user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
Modified: user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
==============================================================================
--- user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk Wed May 4 02:11:45 2016 (r299036)
+++ user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk Wed May 4 02:16:13 2016 (r299037)
@@ -1,12 +1,11 @@
# $FreeBSD$
TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T}
-TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP}
+TESTSRC= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP}
TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP}
-FILESGROUPS+= FILES ${TESTGROUP} ${TESTGROUP}EXE
+FILESGROUPS+= ${TESTGROUP}EXE
-${TESTGROUP}= ${TESTFILES}
${TESTGROUP}EXE= ${TESTEXES}
${TESTGROUP}EXEMODE= 0555
@@ -17,8 +16,8 @@ TEST_METADATA.t_dtrace_contrib+= require
GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh
EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh
-${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}}
- sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET}
+${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${PACKAGE}FILES}
+ sh ${GENTEST} -e ${EXCLUDE} ${${PACKAGE}FILES} ${${TESTGROUP}:S/ */ /} > ${.TARGET}
CLEANFILES+= ${TESTWRAPPER}.sh
Modified: user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Wed May 4 02:11:45 2016 (r299036)
+++ user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Wed May 4 02:16:13 2016 (r299037)
@@ -52,7 +52,9 @@ WITH_CTF=YES
# This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh.
#
-TESTFILES= \\
+PACKAGE= tests
+
+\${PACKAGE}FILES= \\
$tfiles
TESTEXES= \\
More information about the svn-src-user
mailing list