Index: 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	(revision 299036)
+++ user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk	(revision 299037)
@@ -1,48 +1,47 @@
 # $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
 
 TESTWRAPPER=	t_dtrace_contrib
 ATF_TESTS_SH+=	${TESTWRAPPER}
 TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh"
 TEST_METADATA.t_dtrace_contrib+= required_user="root"
 
 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
 
 .PATH:	${TESTSRC}
 
 PROGS=		${CFILES:T:S/.c$/.exe/g}
 .for prog in ${PROGS}
 SRCS.${prog}+= ${prog:S/.exe$/.c/}
 
 .if exists(${prog:S/^tst.//:S/.exe$/.d/})
 SRCS.${prog}+=	${prog:S/^tst.//:S/.exe$/.d/}
 .endif
 .endfor
 
 BINDIR=		${TESTSDIR}
 MAN=
 
 # Some tests depend on the internals of their corresponding test programs,
 # so make sure the optimizer doesn't interfere with them.
 CFLAGS+=	-O0
 
 # Test programs shouldn't be stripped; else we generally can't use the PID
 # provider.
 DEBUG_FLAGS=	-g
 STRIP=
 
 .include <bsd.test.mk>
Index: 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	(revision 299036)
+++ user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	(revision 299037)
@@ -1,84 +1,86 @@
 # $FreeBSD$
 
 usage()
 {
     cat <<__EOF__ >&2
 usage: $(basename $0)
 
 This script regenerates the DTrace test suite makefiles. It should be run
 whenever \$srcdir/cddl/contrib/opensolaris/cmd/dtrace/test/tst is modified.
 __EOF__
     exit 1
 }
 
 # Format a file list for use in a make(1) variable assignment: take the
 # basename of each input file and append " \" to it.
 fmtflist()
 {
     awk 'function bn(f) {
         sub(".*/", "", f)
         return f
     }
     {print "    ", bn($1), " \\"}'
 }
 
 genmakefile()
 {
     local basedir=$1
 
     local tdir=${CONTRIB_TESTDIR}/${basedir}
     local tfiles=$(find $tdir -type f -a \
         \( -name \*.d -o -name \*.ksh -o -name \*.out \) | sort | fmtflist)
     local tcfiles=$(find $tdir -type f -a -name \*.c | sort | fmtflist)
     local texes=$(find $tdir -type f -a -name \*.exe | sort | fmtflist)
 
     # One-off variable definitions.
     local special
     if [ "$basedir" = proc ]; then
         special="
 LIBADD.tst.sigwait.exe+= rt
 "
     elif [ "$basedir" = uctf ]; then
         special="
 WITH_CTF=YES
 "
     fi
 
     local makefile=$(mktemp)
     cat <<__EOF__ > $makefile
 # \$FreeBSD$
 
 #
 # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh.
 #
 
-TESTFILES= \\
+PACKAGE=	tests
+
+\${PACKAGE}FILES= \\
 $tfiles
 
 TESTEXES= \\
 $texes
 
 CFILES= \\
 $tcfiles
 
 $special
 .include "../../dtrace.test.mk"
 __EOF__
 
     mv -f $makefile ${ORIGINDIR}/../common/${basedir}/Makefile
 }
 
 set -e
 
 if [ $# -ne 0 ]; then
     usage
 fi
 
 readonly ORIGINDIR=$(realpath $(dirname $0))
 readonly TOPDIR=$(realpath ${ORIGINDIR}/../../../../..)
 readonly CONTRIB_TESTDIR=${TOPDIR}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common
 
 # Generate a Makefile for each test group under common/.
 for dir in $(find ${CONTRIB_TESTDIR} -mindepth 1 -maxdepth 1 -type d); do
     genmakefile $(basename $dir)
 done