Page MenuHomeFreeBSD
Files F137928765

D24608.id71160.diff
No OneTemporary
Actions

D24608.id71160.diff
View Options

Index: cddl/usr.sbin/dtrace/tests/dtrace.test.mk
===================================================================
--- cddl/usr.sbin/dtrace/tests/dtrace.test.mk
+++ cddl/usr.sbin/dtrace/tests/dtrace.test.mk
@@ -1,7 +1,8 @@
# $FreeBSD$
TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T}
-TESTSRC= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP}
+TESTBASE= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst
+TESTSRC= ${TESTBASE}/${TESTGROUP}
TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP}
FILESGROUPS+= ${TESTGROUP}EXE
@@ -18,7 +19,8 @@
GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh
EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh
${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${PACKAGE}FILES}
- sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${PACKAGE}FILES:S/ */ /} > ${.TARGET}
+ env TESTBASE=${TESTBASE:Q} \
+ sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${PACKAGE}FILES:S/ */ /} > ${.TARGET}
CLEANFILES+= ${TESTWRAPPER}.sh
Index: cddl/usr.sbin/dtrace/tests/tools/exclude.sh
===================================================================
--- cddl/usr.sbin/dtrace/tests/tools/exclude.sh
+++ cddl/usr.sbin/dtrace/tests/tools/exclude.sh
@@ -23,7 +23,22 @@
exclude()
{
- eval $1=\"\$$1\\n$2\"
+ case $2 in
+ # Handle globbing later
+ *"*"*) ;;
+ # No globbing needed
+ *)
+ eval $1=\"\$$1\\n$2\"
+ return
+ ;;
+ esac
+ for file in ${TESTBASE}/${2}; do
+ case ${file} in
+ # Invalid glob
+ "${TESTBASE}/${2}") echo "Invalid exclude for $2" >&2; exit 1; ;;
+ esac
+ exclude "$1" "${file##${TESTBASE}/}"
+ done
}
exclude EXFAIL common/aggs/tst.subr.d

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 8:46 AM (11 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26279125
Default Alt Text
D24608.id71160.diff (1 KB)

Event Timeline