Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installed

after r298107

Summary of changes:

- Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that
  namespacing is kept with FILES appropriately, and that this shouldn't need
  to be repeated if the namespace changes -- only the definition of PACKAGE
  needs to be changed
- Allow PACKAGE to be overridden by callers instead of forcing it to always be
  `tests`. In the event we get to the point where things can be split up
  enough in the base system, it would make more sense to group the tests
  with the blocks they're a part of, e.g. byacc with byacc-tests, etc
- Remove PACKAGE definitions where possible, i.e. where FILES wasn't used
  previously.
- Remove unnecessary TESTSPACKAGE definitions; this has been elided into
  bsd.tests.mk
- Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES;
  ${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk.
- Fix installation of files under data/ subdirectories in lib/libc/tests/hash
  and lib/libc/tests/net/getaddrinfo
- Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup)

Document the proposed changes in share/examples/tests/tests/... via examples
so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of
replacing FILES. share/mk/bsd.README didn't seem like the appropriate method
of communicating that info.

MFC after: never probably
X-MFC with: r298107
PR: 209114
Relnotes: yes
Tested with: buildworld, installworld, checkworld; buildworld, packageworld
Sponsored by: EMC / Isilon Storage Division

84 files changed, 251 insertions, 87 deletions

diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/cddl/usr.sbin/dtrace/tests/Makefile
index 7db6f2f..ba5a736 100644
--- a/cddl/usr.sbin/dtrace/tests/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/Makefile
@@ -5,7 +5,7 @@
 TESTS_SUBDIRS+=	common
 
 .PATH:		${SRCTOP}/tests
-KYUAFILE=	YES
+KYUAFILE=	yes
 
 .PATH:		${.CURDIR}/tools
 SCRIPTSDIR=	${TESTSDIR}
diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
index 2458192..0220157 100644
--- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_AGG_FUNC.bad.d  \
      err.D_AGG_MDIM.bad.d  \
      err.D_AGG_NULL.bad.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
index f8f74f2..2abee2f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_DIV_ZERO.divby0.d  \
      err.D_DIV_ZERO.divby0_1.d  \
      err.D_DIV_ZERO.divby0_2.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
index 0e1cfe1..abbc483 100644
--- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_ARR_BADREF.bad.d  \
      err.D_DECL_ARRBIG.toobig.d  \
      err.D_DECL_ARRNULL.bad.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
index 800dd88..d7e64b8 100644
--- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_OP_INCOMPAT.dupgtype.d  \
      err.D_OP_INCOMPAT.dupttype.d  \
      err.D_OP_INCOMPAT.this.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
index 1572a84..1c254bfe2 100644
--- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_ZERO.begin.d  \
      err.D_PDESC_ZERO.tick.d  \
      tst.begin.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
index 39c199b..903e192 100644
--- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_ADDROF_BITFIELD.BitfieldAddress.d  \
      err.D_DECL_BFCONST.NegBitField.d  \
      err.D_DECL_BFCONST.ZeroBitField.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
index f5b09bf..e9680e5 100644
--- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.end.d  \
      err.resize1.d  \
      err.resize2.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
index a367572..962e8c9 100644
--- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_XLATE_NOCONV.cpuusage.d  \
      err.D_XLATE_NOCONV.nice.d  \
      err.D_XLATE_NOCONV.priority.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
index c6c2551..e98af51 100644
--- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_NOREG.noreg.d  \
      err.baddif.d  \
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
index ff6d01c..0e83523 100644
--- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_IDENT_UNDEF.aggfun.d  \
      err.D_IDENT_UNDEF.aggtup.d  \
      err.D_IDENT_UNDEF.arrtup.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
index c86b69a..7b8e85d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_ZERO.lowfrequency.d  \
      err.D_PDESC_ZERO.malformedoverflow.d  \
      err.D_PDESC_ZERO.nonexistentevent.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
index ea5950f..bd3bf77 100644
--- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_DECL_LOCASSC.NonLocalAssoc.d  \
      err.D_DECL_LONGINT.LongStruct.d  \
      err.D_DECL_PARMCLASS.BadStorageClass.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
index 3e6ca3d..5ca7d09 100644
--- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      badptr.d  \
      countdown.d  \
      counter.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
index 10b1eb5..4f1973c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      drp.DTRACEDROP_AGGREGATION.d  \
      drp.DTRACEDROP_DBLERROR.d  \
      drp.DTRACEDROP_DYNAMIC.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
index 1ce004b..dc77d8f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_ZERO.InvalidDescription1.d  \
      man.APIVersion.d  \
      man.AddSearchPath.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
index 951fed3..a05361e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_IDENT_UNDEF.timespent.d  \
      tst.end.d  \
      tst.endwithoutbegin.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
index 3408586..9b78801 100644
--- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_DECL_IDRED.EnumSameName.d  \
      err.D_UNKNOWN.RepeatIdentifiers.d  \
      tst.EnumEquality.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
index e2f8bf9..afd93dd 100644
--- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.DTRACEFLT_BADADDR.d  \
      tst.DTRACEFLT_DIVZERO.d  \
      tst.DTRACEFLT_UNKNOWN.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
index 1129e0e..3732caa 100644
--- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PROTO_LEN.noarg.d  \
      err.exitarg1.d  \
      tst.basic1.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
index 9097def..c773b78 100644
--- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_ZERO.notreturn.d  \
      tst.basic.d  \
      tst.functionentry.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
index b5a3035..67d0b3c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_FUNC_UNDEF.progenyofbad1.d  \
      err.D_OP_VFPTR.badop.d  \
      err.D_PROTO_ARG.chillbadarg.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
index af5b19b..b9b94f2 100644
--- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_ADDROF_LVAL.d  \
      err.D_EMPTY.empty.d  \
      tst.clauses.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
index a081ac1..d84f25b 100644
--- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.includefirst.ksh  \
 
 TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
index db5fa63..3a30b97 100644
--- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_DECL_IDRED.redef1.d  \
      err.D_DECL_IDRED.redef2.d  \
      err.D_IDENT_UNDEF.recur.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
index 15a37f1..9075358 100644
--- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.fds.d  \
      tst.fds.d.out  \
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
index 0aa648b..805c31f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.ipv4localicmp.ksh  \
      tst.ipv4localicmp.ksh.out  \
      tst.ipv4localtcp.ksh  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
index 6778902..7c7fdef 100644
--- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.Abort.ksh  \
      tst.Abort.ksh.out  \
      tst.Bean.ksh  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
index b380f0f..2440002 100644
--- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.general.d  \
      tst.general.d.out  \
      tst.strsize.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
index 5832493..d53872a 100644
--- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_CHR_NL.char.d  \
      err.D_CHR_NULL.char.d  \
      err.D_INT_DIGIT.InvalidDigit.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
index cf9bbc9..be71bec 100644
--- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_LLQUANT_FACTOREVEN.nodivide.d  \
      err.D_LLQUANT_FACTOREVEN.notfactor.d  \
      err.D_LLQUANT_FACTORMATCH.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
index 8102c7b..26c26e7 100644
--- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.dtracedcmd.ksh  \
 
 TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
index 862ddfc..ed799e6 100644
--- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.icmp.ksh  \
      tst.tcp.ksh  \
      tst.udp.ksh  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
index 2e2e017..87084ab 100644
--- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PRAGMA_OPTSET.d  \
      tst.badopt.d  \
      tst.boolopt.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
index 22ae12a..2c0c426 100644
--- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PRINTA_AGGKEY.d  \
      err.D_PRINTA_AGGPROTO.d  \
      tst.many.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
index 4c76583..b502859 100644
--- a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.call.d  \
      tst.call3.d  \
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
index 204742f..2f56b12 100644
--- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_OFFSETOF_BITFIELD.bitfield.d  \
      err.D_OFFSETOF_TYPE.badtype.d  \
      err.D_OFFSETOF_TYPE.notsou.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
index 08fdf26..daf530b 100644
--- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.ternary.d  \
      tst.ternary.d.out  \
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
index 5228ae3..0b9fdeb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_ZERO.badlib.d  \
      err.D_PDESC_ZERO.badproc1.d  \
      err.D_PROC_BADPID.badproc2.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
index a376358..57e30ed 100644
--- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.available.d  \
      tst.libmap.d  \
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
index 37e1383..af438aa 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.BadAlign.d  \
      err.D_ADDROF_VAR.ArrayVar.d  \
      err.D_ADDROF_VAR.DynamicVar.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
index a595111..26b6920 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PRAGERR.d  \
      err.D_PRAGMA_DEPEND.main.d  \
      err.D_PRAGMA_INVAL.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
index 267f417..bd14b43 100644
--- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PRED_SCALAR.NonScalarPred.d  \
      err.D_SYNTAX.invalid.d  \
      err.D_SYNTAX.operr.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
index 3685edf..f8b8917 100644
--- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_IDENT_UNDEF.afterprobe.d  \
      err.D_PRAGCTL_INVAL.tabdefine.d  \
      err.D_SYNTAX.withoutpound.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
index 60d80ad..af4e20e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PRINT_AGG.bad.d  \
      err.D_PRINT_VOID.bad.d  \
      err.D_PROTO_LEN.bad.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
index 2404aa9..8f5ac36 100644
--- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PRINTA_AGGARG.badagg.d  \
      err.D_PRINTA_AGGARG.badfmt.d  \
      err.D_PRINTA_AGGARG.badval.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
index bda4ecf..86cfdbb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PRINTF_AGG_CONV.aggfmt.d  \
      err.D_PRINTF_ARG_EXTRA.toomany.d  \
      err.D_PRINTF_ARG_EXTRA.widths.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
index 858c53d..36f6106 100644
--- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.fds.ksh  \
      tst.func_access.ksh  \
      tst.getf.ksh  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
index 219973a..8b8d779 100644
--- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_ZERO.probeqtn.d  \
      err.D_PDESC_ZERO.probestar.d  \
      err.D_PDESC_ZERO.tickstar.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
index d565364..5ca083f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.create.ksh  \
      tst.discard.ksh  \
      tst.exec.ksh  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
index 5065fe3..4e5a015 100644
--- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_ZERO.profile.d  \
      err.D_PDESC_ZEROonens.d  \
      err.D_PDESC_ZEROonensec.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
index 650818c..3972831 100644
--- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_INVAL.wrongdec4.d  \
      err.D_PDESC_ZERO.nonprofile.d  \
      err.D_PDESC_ZERO.wrongdec1.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
index 2914199..cde512f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.raise1.d  \
      tst.raise2.d  \
      tst.raise3.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
index 6371e74..bc9ab0a 100644
--- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.aggrate.d  \
      tst.aggrate.d.out  \
      tst.statusrate.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
index 1760f82..5326053 100644
--- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.basename.d  \
      tst.caller.d  \
      tst.cleanpath.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
index ece7045..8a08eac 100644
--- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_ARR_LOCAL.thisarray.d  \
      err.D_DECL_CLASS.selfthis.d  \
      err.D_DECL_CLASS.thisself.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
index 5cdca4e..d1bf425 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.enqueue.d  \
      tst.oncpu.d  \
      tst.stackdepth.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
index 9e52a5d..1562629 100644
--- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_MACRO_UNDEF.invalidargs.d  \
      err.D_OP_LVAL.rdonly.d  \
      err.D_OP_WRITE.usepidmacro.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
index c52c9c9..ad0a43e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.sdtargs.d  \
 
 TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
index df0d68b..021d009 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_IDENT_BADREF.SizeofAssoc.d  \
      err.D_IDENT_UNDEF.UnknownSymbol.d  \
      err.D_SIZEOF_TYPE.badstruct.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
index c7193c2..b5f6ae0 100644
--- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      bug.1001148.SpecSizeVariations.d  \
      err.BufSizeVariations1.d  \
      err.BufSizeVariations2.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
index 939bf65..826202d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_ATTR_MIN.MinAttributes.d  \
 
 TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
index 5a01e94..2fc1e81 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_STACK_PROTO.bad.d  \
      err.D_STACK_SIZE.d  \
      err.D_USTACK_FRAMES.bad.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
index 4b8f342..e7beb43 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.default.d  \
 
 TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
index 56fa9da..50a44bb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.stop1.d  \
      tst.stop2.d  \
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
index af1e7d0..19937d30 100644
--- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.strlen1.d  \
 
 TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
index e614138..0ccc037d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.BaseTooLarge.d  \
      err.BaseTooSmall.d  \
      tst.strtoll.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
index 0b3ce40..35dd51a 100644
--- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_ADDROF_VAR.StructPointer.d  \
      err.D_DECL_COMBO.StructWithoutColon.d  \
      err.D_DECL_COMBO.StructWithoutColon1.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
index 795aeeb..f759b6b 100644
--- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.args.d  \
      tst.openret.ksh  \
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
index 1d612c5..d87b2bb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.post.d  \
      tst.post_chan.d  \
 
diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
index af494f9..1800635 100644
--- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PDESC_ZERO.tick.d  \
      err.D_PDESC_ZEROonens.d  \
      err.D_PDESC_ZEROonensec.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
index 6f5e12e..19ff8e4 100644
--- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PROTO_LEN.bad.d  \
      err.D_TRACE_AGG.bad.d  \
      err.D_TRACE_VOID.bad.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
index 67afa84..29b0ea2 100644
--- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_PROTO_ARG.badsize.d  \
      err.D_PROTO_LEN.toofew.d  \
      err.D_TRACEMEM_ADDR.badaddr.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
index 3722bf7..6d38d1d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_DECL_TYPERED.BadTransDecl.d  \
      err.D_OP_INCOMPLETE.NonExistentInput1.d  \
      err.D_SYNTAX.BadTransDecl1.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
index dbc1f52..d3edcfd 100644
--- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_DECL_IDRED.DupTypeDef.d  \
      err.D_SYNTAX.BadExistingTypedef.d  \
      err.D_SYNTAX.TypedefInClause.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
index 7c65283..89c2947 100644
--- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_CAST_INVAL.badcast.d  \
      err.D_CG_DYN.ResultDynType.d  \
      err.D_CHR_OFLOW.charconst.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
index 2746072..945a853 100644
--- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.invalidpid.d  \
      err.invalidpid2.d  \
      err.invalidpid3.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
index bf3a283..855869f0 100644
--- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      err.D_ADDROF_VAR.UnionPointer.d  \
      err.D_DECL_COMBO.UnionWithoutColon.d  \
      err.D_DECL_COMBO.UnionWithoutColon1.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
index b4f6623..dd55719 100644
--- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      argmap.d  \
      args.d  \
      forker.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
index 5acdf6d..6ea0621 100644
--- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.bigstack.d  \
      tst.depth.ksh  \
      tst.spin.ksh  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
index a08a3ce..bced0bf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.gid.d  \
      tst.nullassign.d  \
      tst.ppid.d  \
diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
index 6c9da25..3f1589f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
@@ -4,7 +4,9 @@
 # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
 #
 
-TESTFILES= \
+PACKAGE=	tests
+
+${PACKAGE}FILES= \
      tst.1.0.d  \
 
 TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
index 0c528ef..d49a503 100644
--- a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
+++ b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
@@ -1,14 +1,14 @@
 # $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
+${TESTGROUP}EXEPACKAGE=	${PACKAGE}
 
 TESTWRAPPER=	t_dtrace_contrib
 ATF_TESTS_SH+=	${TESTWRAPPER}
@@ -17,7 +17,7 @@ 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}}
+${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${PACKAGE}FILES}
 	sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET}
 
 CLEANFILES+=	${TESTWRAPPER}.sh
diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
index fda81fb..9953064 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
@@ -52,7 +52,9 @@ WITH_CTF=YES
 # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh.
 #
 
-TESTFILES= \\
+PACKAGE=	tests
+
+\${PACKAGE}FILES= \\
 $tfiles
 
 TESTEXES= \\