Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177742487
D60928.1795178205.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
115 KB
Referenced Files
None
Subscribers
None
D60928.1795178205.diff
View Options
diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1526,15 +1526,44 @@
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
.endif
.endfor
-.if ${MK_TESTS} != "no" && ${dist} == "tests"
+.if ${MK_TESTS} != "no"
+. if ${dist} == "tests"
-mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
-.if ${MK_DEBUG_FILES} != "no"
+. if ${MK_DEBUG_FILES} != "no"
${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug${TESTSBASE} >/dev/null
+. endif
+. endif # dist == "tests"
+. if ${MK_CDDL} != "no" && ${dist} == "cddl-tests"
+ -mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
+ ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
+. if ${MK_DEBUG_FILES} != "no"
+ ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug${TESTSBASE} >/dev/null
+. endif
+. endif # MK_CDDL != "no" ...
+.endif # MK_TESTS != "no"
+.if ${MK_DTRACE_TESTS} != "no" && ${dist} == "dtrace-tests"
+ -mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
+ ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.dtrace-tests.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+ ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.dtrace-tests.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug${TESTSBASE} >/dev/null
.endif
+.endif # MK_DTRACE_TESTS != no
+.if ${MK_ZFS_TESTS} != "no" && ${dist} == "zfs-tests"
+ -mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
+ ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.zfs-tests.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+ ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.zfs-tests.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug${TESTSBASE} >/dev/null
.endif
+.endif # MK_ZFS_TESTS != no
${IMAKEENV} ${DISTR_MTREE} -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
sed -e 's#^\./#./${dist}/#' >> ${METALOG}
${IMAKEENV} ${DISTR_MTREE} -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \
diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile
--- a/cddl/lib/tests/Makefile
+++ b/cddl/lib/tests/Makefile
@@ -1,4 +1,6 @@
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
+PACKAGE= cddl-tests
+
.include <bsd.test.mk>
diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile
--- a/cddl/sbin/tests/Makefile
+++ b/cddl/sbin/tests/Makefile
@@ -1,4 +1,6 @@
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
+PACKAGE= cddl-tests
+
.include <bsd.test.mk>
diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile
--- a/cddl/tests/Makefile
+++ b/cddl/tests/Makefile
@@ -1,4 +1,5 @@
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
+PACKAGE= cddl-tests
.include <bsd.test.mk>
diff --git a/cddl/usr.bin/ctfconvert/tests/Makefile b/cddl/usr.bin/ctfconvert/tests/Makefile
--- a/cddl/usr.bin/ctfconvert/tests/Makefile
+++ b/cddl/usr.bin/ctfconvert/tests/Makefile
@@ -1,3 +1,5 @@
ATF_TESTS_SH+= ctfconvert_test
+PACKAGE= cddl-tests
+
.include <bsd.test.mk>
diff --git a/cddl/usr.bin/ztest/tests/Makefile b/cddl/usr.bin/ztest/tests/Makefile
--- a/cddl/usr.bin/ztest/tests/Makefile
+++ b/cddl/usr.bin/ztest/tests/Makefile
@@ -1,5 +1,5 @@
-.include <bsd.own.mk>
-
ATF_TESTS_SH+= ztest
+PACKAGE= cddl-tests
+
.include <bsd.test.mk>
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
--- a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.rax.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_AGG_FUNC.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_DIV_ZERO.divby0.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_ARR_BADREF.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_OP_INCOMPAT.dupgtype.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_ZERO.begin.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_ADDROF_BITFIELD.BitfieldAddress.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.end.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_XLATE_NOCONV.cpuusage.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_NOREG.noreg.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_IDENT_UNDEF.aggfun.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_ZERO.lowfrequency.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_DECL_LOCASSC.NonLocalAssoc.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
badptr.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
drp.DTRACEDROP_AGGREGATION.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_ZERO.InvalidDescription1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_IDENT_UNDEF.timespent.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_DECL_IDRED.EnumSameName.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/env/Makefile b/cddl/usr.sbin/dtrace/tests/common/env/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/env/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/env/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PRAGMA_OPTSET.setfromscript.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.DTRACEFLT_BADADDR.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PROTO_LEN.noarg.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_ZERO.notreturn.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_FUNC_UNDEF.progenyofbad1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_ADDROF_LVAL.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.includefirst.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_DECL_IDRED.redef1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.fds.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.ipv4localicmp.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.Abort.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.general.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.basic.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_CHR_NL.char.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_LLQUANT_FACTOREVEN.nodivide.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.dtracedcmd.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.icmp.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PRAGMA_OPTSET.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PRINTA_AGGKEY.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.call.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_OFFSETOF_BITFIELD.bitfield.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile b/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.agg.avg.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.ternary.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_ZERO.badlib.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.available.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.BadAlign.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PRAGERR.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PRED_SCALAR.NonScalarPred.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_IDENT_UNDEF.afterprobe.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PRINT_AGG.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PRINTA_AGGARG.badagg.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PRINTF_AGG_CONV.aggfmt.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.fds.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_ZERO.probeqtn.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.create.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_ZERO.profile.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_INVAL.wrongdec4.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.raise1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.aggrate.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.basename.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_ARR_LOCAL.thisarray.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.enqueue.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_MACRO_UNDEF.invalidargs.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.sdtargs.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_IDENT_BADREF.SizeofAssoc.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
bug.1001148.SpecSizeVariations.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_ATTR_MIN.MinAttributes.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_STACK_PROTO.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.default.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.stop1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.strlen1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.BaseTooLarge.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_ADDROF_VAR.StructPointer.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.else.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.args.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.post.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PDESC_ZERO.tick.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PROTO_LEN.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_PROTO_ARG.badsize.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_DECL_TYPERED.BadTransDecl.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_DECL_IDRED.DupTypeDef.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_CAST_INVAL.badcast.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.invalidpid.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
err.D_ADDROF_VAR.UnionPointer.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
argmap.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.bigstack.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.gid.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
--- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.1.0.d \
diff --git a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
--- a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.uregsarray.d \
diff --git a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
--- a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.badcopyin.d \
diff --git a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
--- a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
tst.badinstr.d \
diff --git a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
--- a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
@@ -2,7 +2,7 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \
annotated_helper.d \
diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
--- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
@@ -63,7 +63,7 @@
# This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh.
#
-PACKAGE= tests
+PACKAGE= dtrace-tests
TFILES= \\
$tfiles
diff --git a/cddl/usr.sbin/zfsd/tests/Makefile b/cddl/usr.sbin/zfsd/tests/Makefile
--- a/cddl/usr.sbin/zfsd/tests/Makefile
+++ b/cddl/usr.sbin/zfsd/tests/Makefile
@@ -1,6 +1,8 @@
.include "${.CURDIR}/../Makefile.common"
.PATH: ${.CURDIR:H}
+PACKAGE= cddl-tests
+
GTESTS= zfsd_unittest
SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc}
diff --git a/contrib/kyua/utils/process/child.cpp b/contrib/kyua/utils/process/child.cpp
--- a/contrib/kyua/utils/process/child.cpp
+++ b/contrib/kyua/utils/process/child.cpp
@@ -225,7 +225,6 @@
}
return {};
} else {
- ::close(fds[1]);
LD(F("Spawned process %s: stdout and stderr inherited") % pid);
signals::add_pid_to_kill(pid);
inhibiter.reset(NULL); // Unblock signals.
@@ -336,10 +335,10 @@
std::unique_ptr< process::child >
process::child::spawn_capture(const fs::path& program, const args_vector& args)
{
+ log_exec(program, args);
std::unique_ptr< child > child = fork_capture_aux();
if (child.get() == NULL)
exec(program, args);
- log_exec(program, args);
return child;
}
@@ -365,10 +364,10 @@
const fs::path& stdout_file,
const fs::path& stderr_file)
{
+ log_exec(program, args);
std::unique_ptr< child > child = fork_files_aux(stdout_file, stderr_file);
if (child.get() == NULL)
exec(program, args);
- log_exec(program, args);
return child;
}
diff --git a/etc/mtree/BSD.cddl-tests.dist b/etc/mtree/BSD.cddl-tests.dist
new file mode 100644
--- /dev/null
+++ b/etc/mtree/BSD.cddl-tests.dist
@@ -0,0 +1,29 @@
+#
+# Items covered by the `cddl-tests` distribution.
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755 tags=package=cddl-tests
+.
+ cddl
+ lib
+ ..
+ oclo
+ ..
+ sbin
+ ..
+ usr.bin
+ ctfconvert
+ ..
+ ztest
+ ..
+ ..
+ usr.sbin
+ zfsd
+ ..
+ ..
+ ..
+..
+
+# vim: set expandtab ts=4 sw=4:
diff --git a/etc/mtree/BSD.dtrace-tests.dist b/etc/mtree/BSD.dtrace-tests.dist
new file mode 100644
--- /dev/null
+++ b/etc/mtree/BSD.dtrace-tests.dist
@@ -0,0 +1,199 @@
+#
+# Items covered by the `dtrace-tests` distribution.
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755 tags=package=dtrace-tests
+.
+ cddl
+ usr.sbin
+ dtrace
+ amd64
+ arrays
+ ..
+ ..
+ common
+ aggs
+ ..
+ arithmetic
+ ..
+ arrays
+ ..
+ assocs
+ ..
+ begin
+ ..
+ bitfields
+ ..
+ buffering
+ ..
+ builtinvar
+ ..
+ cg
+ ..
+ clauses
+ ..
+ cpc
+ ..
+ decls
+ ..
+ drops
+ ..
+ dtraceUtil
+ ..
+ end
+ ..
+ enum
+ ..
+ env
+ ..
+ error
+ ..
+ exit
+ ..
+ fbtprovider
+ ..
+ funcs
+ ..
+ grammar
+ ..
+ include
+ ..
+ inline
+ ..
+ io
+ ..
+ ip
+ ..
+ java_api
+ ..
+ json
+ ..
+ kinst
+ ..
+ lexer
+ ..
+ llquantize
+ ..
+ mdb
+ ..
+ mib
+ ..
+ misc
+ ..
+ multiaggs
+ ..
+ offsetof
+ ..
+ oformat
+ ..
+ operators
+ ..
+ pid
+ ..
+ plockstat
+ ..
+ pointers
+ ..
+ pragma
+ ..
+ predicates
+ ..
+ preprocessor
+ ..
+ print
+ ..
+ printa
+ ..
+ printf
+ ..
+ privs
+ ..
+ probes
+ ..
+ proc
+ ..
+ profile-n
+ ..
+ providers
+ ..
+ raise
+ ..
+ rates
+ ..
+ safety
+ ..
+ scalars
+ ..
+ sched
+ ..
+ scripting
+ ..
+ sdt
+ ..
+ sizeof
+ ..
+ speculation
+ ..
+ stability
+ ..
+ stack
+ ..
+ stackdepth
+ ..
+ stop
+ ..
+ strlen
+ ..
+ strtoll
+ ..
+ struct
+ ..
+ sugar
+ ..
+ syscall
+ ..
+ sysevent
+ ..
+ tick-n
+ ..
+ trace
+ ..
+ tracemem
+ ..
+ translators
+ ..
+ typedef
+ ..
+ types
+ ..
+ uctf
+ ..
+ union
+ ..
+ usdt
+ ..
+ ustack
+ ..
+ vars
+ ..
+ version
+ ..
+ ..
+ i386
+ arrays
+ ..
+ funcs
+ ..
+ pid
+ ..
+ ustack
+ ..
+ ..
+ ..
+ ..
+ ..
+..
+
+# vim: set expandtab ts=4 sw=4:
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -1,4 +1,6 @@
#
+# Items covered by the `tests` distribution.
+#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -82,208 +84,6 @@
timeout
..
..
- cddl
- lib
- ..
- oclo
- ..
- sbin
- ..
- usr.bin
- ctfconvert
- ..
- ztest
- ..
- ..
- usr.sbin
- dtrace
- amd64
- arrays
- ..
- ..
- common
- aggs
- ..
- arithmetic
- ..
- arrays
- ..
- assocs
- ..
- begin
- ..
- bitfields
- ..
- buffering
- ..
- builtinvar
- ..
- cg
- ..
- clauses
- ..
- cpc
- ..
- decls
- ..
- drops
- ..
- dtraceUtil
- ..
- end
- ..
- enum
- ..
- env
- ..
- error
- ..
- exit
- ..
- fbtprovider
- ..
- funcs
- ..
- grammar
- ..
- include
- ..
- inline
- ..
- io
- ..
- ip
- ..
- java_api
- ..
- json
- ..
- kinst
- ..
- lexer
- ..
- llquantize
- ..
- mdb
- ..
- mib
- ..
- misc
- ..
- multiaggs
- ..
- offsetof
- ..
- oformat
- ..
- operators
- ..
- pid
- ..
- plockstat
- ..
- pointers
- ..
- pragma
- ..
- predicates
- ..
- preprocessor
- ..
- print
- ..
- printa
- ..
- printf
- ..
- privs
- ..
- probes
- ..
- proc
- ..
- profile-n
- ..
- providers
- ..
- raise
- ..
- rates
- ..
- safety
- ..
- scalars
- ..
- sched
- ..
- scripting
- ..
- sdt
- ..
- sizeof
- ..
- speculation
- ..
- stability
- ..
- stack
- ..
- stackdepth
- ..
- stop
- ..
- strlen
- ..
- strtoll
- ..
- struct
- ..
- sugar
- ..
- syscall
- ..
- sysevent
- ..
- tick-n
- ..
- trace
- ..
- tracemem
- ..
- translators
- ..
- typedef
- ..
- types
- ..
- uctf
- ..
- union
- ..
- usdt
- ..
- ustack
- ..
- vars
- ..
- version
- ..
- ..
- i386
- arrays
- ..
- funcs
- ..
- pid
- ..
- ustack
- ..
- ..
- ..
- zfsd
- ..
- ..
- ..
etc
rc.d
..
@@ -571,250 +371,6 @@
..
capsicum
..
- cddl
- zfs
- bin
- ..
- include
- ..
- tests
- acl
- cifs
- ..
- nontrivial
- ..
- trivial
- ..
- ..
- atime
- ..
- bootfs
- ..
- cache
- ..
- cachefile
- ..
- clean_mirror
- ..
- cli_root
- zdb
- ..
- zfs
- ..
- zfs_clone
- ..
- zfs_copies
- ..
- zfs_create
- ..
- zfs_destroy
- ..
- zfs_diff
- ..
- zfs_get
- ..
- zfs_inherit
- ..
- zfs_mount
- ..
- zfs_promote
- ..
- zfs_property
- ..
- zfs_receive
- ..
- zfs_rename
- ..
- zfs_reservation
- ..
- zfs_rollback
- ..
- zfs_send
- ..
- zfs_set
- ..
- zfs_share
- ..
- zfs_snapshot
- ..
- zfs_unmount
- ..
- zfs_unshare
- ..
- zfs_upgrade
- ..
- zpool
- ..
- zpool_add
- ..
- zpool_attach
- ..
- zpool_clear
- ..
- zpool_create
- ..
- zpool_destroy
- ..
- zpool_detach
- ..
- zpool_expand
- ..
- zpool_export
- ..
- zpool_get
- ..
- zpool_history
- ..
- zpool_import
- blockfiles
- ..
- ..
- zpool_offline
- ..
- zpool_online
- ..
- zpool_remove
- ..
- zpool_replace
- ..
- zpool_scrub
- ..
- zpool_set
- ..
- zpool_status
- ..
- zpool_upgrade
- blockfiles
- ..
- ..
- ..
- cli_user
- misc
- ..
- zfs_list
- ..
- zpool_iostat
- ..
- zpool_list
- ..
- ..
- compression
- ..
- ctime
- ..
- delegate
- ..
- devices
- ..
- exec
- ..
- grow_pool
- ..
- grow_replicas
- ..
- history
- ..
- hotplug
- ..
- hotspare
- ..
- inheritance
- ..
- interop
- ..
- inuse
- ..
- iscsi
- ..
- large_files
- ..
- largest_pool
- ..
- link_count
- ..
- migration
- ..
- mmap
- ..
- mount
- ..
- mv_files
- ..
- nestedfs
- ..
- no_space
- ..
- online_offline
- ..
- pool_names
- ..
- poolversion
- ..
- quota
- ..
- redundancy
- ..
- refquota
- ..
- refreserv
- ..
- rename_dirs
- ..
- replacement
- ..
- reservation
- ..
- rootpool
- ..
- rsend
- ..
- scrub_mirror
- ..
- slog
- ..
- snapshot
- ..
- snapused
- ..
- sparse
- ..
- threadsappend
- ..
- truncate
- ..
- txg_integrity
- ..
- userquota
- ..
- utils_test
- ..
- write_dirs
- ..
- xattr
- ..
- zfsd
- ..
- zil
- ..
- zinject
- ..
- zones
- ..
- zvol
- zvol_ENOSPC
- ..
- zvol_cli
- ..
- zvol_misc
- ..
- zvol_swap
- ..
- ..
- zvol_thrash
- ..
- ..
- ..
- ..
common
..
compat32
diff --git a/etc/mtree/BSD.zfs-tests.dist b/etc/mtree/BSD.zfs-tests.dist
new file mode 100644
--- /dev/null
+++ b/etc/mtree/BSD.zfs-tests.dist
@@ -0,0 +1,257 @@
+#
+# Items covered by the `zfs-tests` distribution.
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755 tags=package=zfs-tests
+.
+ sys
+ cddl
+ zfs
+ bin
+ ..
+ include
+ ..
+ tests
+ acl
+ cifs
+ ..
+ nontrivial
+ ..
+ trivial
+ ..
+ ..
+ atime
+ ..
+ bootfs
+ ..
+ cache
+ ..
+ cachefile
+ ..
+ clean_mirror
+ ..
+ cli_root
+ zdb
+ ..
+ zfs
+ ..
+ zfs_clone
+ ..
+ zfs_copies
+ ..
+ zfs_create
+ ..
+ zfs_destroy
+ ..
+ zfs_diff
+ ..
+ zfs_get
+ ..
+ zfs_inherit
+ ..
+ zfs_mount
+ ..
+ zfs_promote
+ ..
+ zfs_property
+ ..
+ zfs_receive
+ ..
+ zfs_rename
+ ..
+ zfs_reservation
+ ..
+ zfs_rollback
+ ..
+ zfs_send
+ ..
+ zfs_set
+ ..
+ zfs_share
+ ..
+ zfs_snapshot
+ ..
+ zfs_unmount
+ ..
+ zfs_unshare
+ ..
+ zfs_upgrade
+ ..
+ zpool
+ ..
+ zpool_add
+ ..
+ zpool_attach
+ ..
+ zpool_clear
+ ..
+ zpool_create
+ ..
+ zpool_destroy
+ ..
+ zpool_detach
+ ..
+ zpool_expand
+ ..
+ zpool_export
+ ..
+ zpool_get
+ ..
+ zpool_history
+ ..
+ zpool_import
+ blockfiles
+ ..
+ ..
+ zpool_offline
+ ..
+ zpool_online
+ ..
+ zpool_remove
+ ..
+ zpool_replace
+ ..
+ zpool_scrub
+ ..
+ zpool_set
+ ..
+ zpool_status
+ ..
+ zpool_upgrade
+ blockfiles
+ ..
+ ..
+ ..
+ cli_user
+ misc
+ ..
+ zfs_list
+ ..
+ zpool_iostat
+ ..
+ zpool_list
+ ..
+ ..
+ compression
+ ..
+ ctime
+ ..
+ delegate
+ ..
+ devices
+ ..
+ exec
+ ..
+ grow_pool
+ ..
+ grow_replicas
+ ..
+ history
+ ..
+ hotplug
+ ..
+ hotspare
+ ..
+ inheritance
+ ..
+ interop
+ ..
+ inuse
+ ..
+ iscsi
+ ..
+ large_files
+ ..
+ largest_pool
+ ..
+ link_count
+ ..
+ migration
+ ..
+ mmap
+ ..
+ mount
+ ..
+ mv_files
+ ..
+ nestedfs
+ ..
+ no_space
+ ..
+ online_offline
+ ..
+ pool_names
+ ..
+ poolversion
+ ..
+ quota
+ ..
+ redundancy
+ ..
+ refquota
+ ..
+ refreserv
+ ..
+ rename_dirs
+ ..
+ replacement
+ ..
+ reservation
+ ..
+ rootpool
+ ..
+ rsend
+ ..
+ scrub_mirror
+ ..
+ slog
+ ..
+ snapshot
+ ..
+ snapused
+ ..
+ sparse
+ ..
+ threadsappend
+ ..
+ truncate
+ ..
+ txg_integrity
+ ..
+ userquota
+ ..
+ utils_test
+ ..
+ write_dirs
+ ..
+ xattr
+ ..
+ zfsd
+ ..
+ zil
+ ..
+ zinject
+ ..
+ zones
+ ..
+ zvol
+ zvol_ENOSPC
+ ..
+ zvol_cli
+ ..
+ zvol_misc
+ ..
+ zvol_swap
+ ..
+ ..
+ zvol_thrash
+ ..
+ ..
+ ..
+ ..
+ ..
+..
+
+# vim: set expandtab ts=4 sw=4:
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -6,7 +6,9 @@
# NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use.
FILES= \
+ ${_BSD.cddl-tests.dist} \
BSD.debug.dist \
+ ${_BSD.dtrace-tests.dist} \
BSD.include.dist \
BSD.root.dist \
${_BSD.libcompats.dist} \
@@ -14,6 +16,7 @@
${_BSD.tests.dist} \
BSD.usr.dist \
BSD.var.dist
+ ${_BSD.zfs-tests.dist} \
.for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats}
.if ${MK_LIB${LIBCOMPAT}} != "no"
@@ -24,6 +27,15 @@
_BSD.sendmail.dist= BSD.sendmail.dist
.endif
.if ${MK_TESTS} != "no"
+.if ${MK_CDDL} != "no"
+_BSD.cddl-tests.dist= BSD.cddl-tests.dist
+.endif
+. if ${MK_DTRACE_TESTS} != "no"
+_BSD.dtrace-tests.dist= BSD.dtrace-tests.dist
+. endif
+. if ${MK_ZFS_TESTS} != "no"
+_BSD.zfs-tests.dist= BSD.zfs-tests.dist
+. endif
_BSD.tests.dist= BSD.tests.dist
.endif
diff --git a/etc/mtree/README b/etc/mtree/README
--- a/etc/mtree/README
+++ b/etc/mtree/README
@@ -1,4 +1,10 @@
-Note: If you modify these files, please keep hier(7) updated!
+## Introduction
+
+This file provides helpful information related to mtree files in this
+directory.
+
+**Important**: If you modify these files, please keep targets like
+distribute*(7) and hierarchy(7) update to date!
These files are used to create empty file hierarchies for building the
system into. Some notes about working with them are placed here to try
@@ -46,3 +52,19 @@
If you want details on it bug me about it via email to
rgrimes@FreeBSD.org.
+
+## Build knob-specific information
+
+Specific mtree files are only installed if specific build knobs are enabled.
+Here's a quick guide:
+
+### Test-specific mtree files
+
+All items in this section are gated by `MK_TESTS` != no.
+
+| Additional knobs | File | pkgbase distribution |
+ ------------------|-----------------------|-----------------------|
+| n/a | BSD.tests.dist | tests |
+| MK_CDDL | BSD.cddl-tests.dist | cddl-tests |
+| MK_DTRACE_TESTS | BSD.dtrace-tests.dist | dtrace-tests |
+| MK_ZFS_TESTS | BSD.zfs-tests.dist | zfs-tests |
diff --git a/packages/Makefile b/packages/Makefile
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -97,6 +97,10 @@
SUBDIR+= caroot
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR.${MK_CDDL}+= cddl-tests
+.endif
+
SUBDIR.${MK_AT}+= at
SUBDIR.${MK_AUDIT}+= audit
SUBDIR.${MK_AUTOFS}+= autofs
@@ -110,6 +114,7 @@
SUBDIR.${MK_CXGBETOOL}+= cxgbe-tools
SUBDIR.${MK_DMAGENT}+= dma
SUBDIR.${MK_DTRACE}+= ctf dtrace dwatch
+SUBDIR.${MK_DTRACE_TESTS}+= dtrace-tests
SUBDIR.${MK_EE}+= ee
SUBDIR.${MK_EFI}+= efi-tools
SUBDIR.${MK_EXAMPLES}+= examples
@@ -157,6 +162,7 @@
SUBDIR.${MK_VT}+= vt-data
SUBDIR.${MK_WIRELESS}+= hostapd wpa
SUBDIR.${MK_ZFS}+= zfs
+SUBDIR.${MK_ZFS_TESTS}+= zfs-tests
SUBDIR.${MK_ZONEINFO}+= zoneinfo
.include <bsd.arch.inc.mk>
diff --git a/packages/cddl-tests/Makefile b/packages/cddl-tests/Makefile
new file mode 100644
--- /dev/null
+++ b/packages/cddl-tests/Makefile
@@ -0,0 +1,14 @@
+WORLDPACKAGE= cddl-tests
+
+PKG_SETS= tests
+
+# Some CDDL tests use ATF; others use googletest; and all of them require
+# kyua to be run.
+PKG_DEPS.cddl-tests+= atf
+PKG_DEPS.cddl-tests+= googletest
+PKG_DEPS.cddl-tests+= kyua
+
+# There isn't a better dependency to rely on (right now).
+PKG_DEPS.cddl-tests+= set-base
+
+.include <bsd.pkg.mk>
diff --git a/packages/cddl-tests/cddl-tests.ucl b/packages/cddl-tests/cddl-tests.ucl
new file mode 100644
--- /dev/null
+++ b/packages/cddl-tests/cddl-tests.ucl
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2026 Enji Cooper <ngie@FreeBSD.org>
+ */
+
+comment = "Miscellaneous CDDL test suite"
+
+desc = <<EOD
+A miscellaneous CDDL-feature specific test suite.
+
+This test suite is distributed in addition to the DTrace and ZFS test suites.
+EOD
diff --git a/packages/dtrace-tests/Makefile b/packages/dtrace-tests/Makefile
new file mode 100644
--- /dev/null
+++ b/packages/dtrace-tests/Makefile
@@ -0,0 +1,12 @@
+WORLDPACKAGE= dtrace-tests
+SUBPACKAGES= dbg
+
+PKG_SETS= dtrace-tests
+
+# The DTrace tests require Kyua to be run
+PKG_DEPS.dtrace-tests+= kyua
+
+# These tests test DTrace
+PKG_DEPS.dtrace-tests+= dtrace
+
+.include <bsd.pkg.mk>
diff --git a/packages/dtrace-tests/dtrace-tests.ucl b/packages/dtrace-tests/dtrace-tests.ucl
new file mode 100644
--- /dev/null
+++ b/packages/dtrace-tests/dtrace-tests.ucl
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2026 Enji Cooper <ngie@FreeBSD.org>
+ */
+
+comment = "DTrace test suite"
+
+desc = <<EOD
+The DTrace test suite, installed in /usr/tests, tests DTrace support in the
+installed system.
+EOD
diff --git a/packages/zfs-tests/Makefile b/packages/zfs-tests/Makefile
new file mode 100644
--- /dev/null
+++ b/packages/zfs-tests/Makefile
@@ -0,0 +1,15 @@
+WORLDPACKAGE= zfs-tests
+SUBPACKAGES= dbg
+
+PKG_SETS= tests
+
+# Some tests require ATF; some tests need GoogleTest; all require Kyua to be
+# run.
+PKG_DEPS.zfs-tests+= atf
+PKG_DEPS.zfs-tests+= googletest
+PKG_DEPS.zfs-tests+= kyua
+
+# These tests test ZFS
+PKG_DEPS.zfs-tests+= zfs
+
+.include <bsd.pkg.mk>
diff --git a/packages/zfs-tests/zfs-tests.ucl b/packages/zfs-tests/zfs-tests.ucl
new file mode 100644
--- /dev/null
+++ b/packages/zfs-tests/zfs-tests.ucl
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: ISC
+ *
+ * Copyright (c) 2026 Enji Cooper <ngie@FreeBSD.org>
+ */
+
+comment = "ZFS test suite"
+
+desc = <<EOD
+The ZFS test suite, installed in /usr/tests, tests the ZFS feature in FreeBSD.
+EOD
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -417,8 +417,10 @@
.if ${MK_CDDL} == "no"
MK_CTF:= no
MK_DTRACE:= no
+MK_DTRACE_TESTS:= no
MK_LOADER_ZFS:= no
MK_ZFS:= no
+MK_ZFS_TESTS:= no
.endif
.if ${MK_CRYPT} == "no"
diff --git a/tests/oclo/Makefile b/tests/oclo/Makefile
--- a/tests/oclo/Makefile
+++ b/tests/oclo/Makefile
@@ -7,4 +7,6 @@
SRCS.oclo= oclo.c
LIBADD.ocloexec_verify+= util
+PACKAGE= cddl-tests
+
.include <bsd.test.mk>
diff --git a/tests/sys/cddl/zfs/tests/acl/Makefile b/tests/sys/cddl/zfs/tests/acl/Makefile
--- a/tests/sys/cddl/zfs/tests/acl/Makefile
+++ b/tests/sys/cddl/zfs/tests/acl/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/acl
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/acl/cifs/Makefile b/tests/sys/cddl/zfs/tests/acl/cifs/Makefile
--- a/tests/sys/cddl/zfs/tests/acl/cifs/Makefile
+++ b/tests/sys/cddl/zfs/tests/acl/cifs/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/acl/cifs
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile b/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile
--- a/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile
+++ b/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/acl/nontrivial
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/acl/trivial/Makefile b/tests/sys/cddl/zfs/tests/acl/trivial/Makefile
--- a/tests/sys/cddl/zfs/tests/acl/trivial/Makefile
+++ b/tests/sys/cddl/zfs/tests/acl/trivial/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/acl/trivial
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/atime/Makefile b/tests/sys/cddl/zfs/tests/atime/Makefile
--- a/tests/sys/cddl/zfs/tests/atime/Makefile
+++ b/tests/sys/cddl/zfs/tests/atime/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/atime
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/bootfs/Makefile b/tests/sys/cddl/zfs/tests/bootfs/Makefile
--- a/tests/sys/cddl/zfs/tests/bootfs/Makefile
+++ b/tests/sys/cddl/zfs/tests/bootfs/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/bootfs
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cache/Makefile b/tests/sys/cddl/zfs/tests/cache/Makefile
--- a/tests/sys/cddl/zfs/tests/cache/Makefile
+++ b/tests/sys/cddl/zfs/tests/cache/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cache
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cachefile/Makefile b/tests/sys/cddl/zfs/tests/cachefile/Makefile
--- a/tests/sys/cddl/zfs/tests/cachefile/Makefile
+++ b/tests/sys/cddl/zfs/tests/cachefile/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cachefile
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/clean_mirror/Makefile b/tests/sys/cddl/zfs/tests/clean_mirror/Makefile
--- a/tests/sys/cddl/zfs/tests/clean_mirror/Makefile
+++ b/tests/sys/cddl/zfs/tests/clean_mirror/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/clean_mirror
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/Makefile b/tests/sys/cddl/zfs/tests/cli_root/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zdb
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_clone
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_copies
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_create
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_destroy
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_get
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_inherit
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_mount
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_promote
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_property
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_receive
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_rename
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_reservation
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_rollback
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_send
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_set
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_share
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_snapshot
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_unmount
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_unshare
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zfs_upgrade
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_add
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_attach
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_clear
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_create
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_destroy
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_detach
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_expand
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_export
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_get
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_history
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_import
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_offline
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_online
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_remove
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_replace
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_scrub
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_set
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_status
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_upgrade
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_user/Makefile b/tests/sys/cddl/zfs/tests/cli_user/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_user/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_user/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile b/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/misc
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zfs_list
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zpool_iostat
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile
--- a/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile
+++ b/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_user/zpool_list
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/compression/Makefile b/tests/sys/cddl/zfs/tests/compression/Makefile
--- a/tests/sys/cddl/zfs/tests/compression/Makefile
+++ b/tests/sys/cddl/zfs/tests/compression/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/compression
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/ctime/Makefile b/tests/sys/cddl/zfs/tests/ctime/Makefile
--- a/tests/sys/cddl/zfs/tests/ctime/Makefile
+++ b/tests/sys/cddl/zfs/tests/ctime/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/ctime
FILESDIR=${TESTSDIR}
BINDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/delegate/Makefile b/tests/sys/cddl/zfs/tests/delegate/Makefile
--- a/tests/sys/cddl/zfs/tests/delegate/Makefile
+++ b/tests/sys/cddl/zfs/tests/delegate/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/delegate
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/devices/Makefile b/tests/sys/cddl/zfs/tests/devices/Makefile
--- a/tests/sys/cddl/zfs/tests/devices/Makefile
+++ b/tests/sys/cddl/zfs/tests/devices/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/devices
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/exec/Makefile b/tests/sys/cddl/zfs/tests/exec/Makefile
--- a/tests/sys/cddl/zfs/tests/exec/Makefile
+++ b/tests/sys/cddl/zfs/tests/exec/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/exec
FILESDIR=${TESTSDIR}
BINDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/grow_pool/Makefile b/tests/sys/cddl/zfs/tests/grow_pool/Makefile
--- a/tests/sys/cddl/zfs/tests/grow_pool/Makefile
+++ b/tests/sys/cddl/zfs/tests/grow_pool/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/grow_pool
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/grow_replicas/Makefile b/tests/sys/cddl/zfs/tests/grow_replicas/Makefile
--- a/tests/sys/cddl/zfs/tests/grow_replicas/Makefile
+++ b/tests/sys/cddl/zfs/tests/grow_replicas/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/grow_replicas
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/history/Makefile b/tests/sys/cddl/zfs/tests/history/Makefile
--- a/tests/sys/cddl/zfs/tests/history/Makefile
+++ b/tests/sys/cddl/zfs/tests/history/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/history
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/hotplug/Makefile b/tests/sys/cddl/zfs/tests/hotplug/Makefile
--- a/tests/sys/cddl/zfs/tests/hotplug/Makefile
+++ b/tests/sys/cddl/zfs/tests/hotplug/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/hotplug
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/hotspare/Makefile b/tests/sys/cddl/zfs/tests/hotspare/Makefile
--- a/tests/sys/cddl/zfs/tests/hotspare/Makefile
+++ b/tests/sys/cddl/zfs/tests/hotspare/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/hotspare
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/inheritance/Makefile b/tests/sys/cddl/zfs/tests/inheritance/Makefile
--- a/tests/sys/cddl/zfs/tests/inheritance/Makefile
+++ b/tests/sys/cddl/zfs/tests/inheritance/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/inheritance
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/interop/Makefile b/tests/sys/cddl/zfs/tests/interop/Makefile
--- a/tests/sys/cddl/zfs/tests/interop/Makefile
+++ b/tests/sys/cddl/zfs/tests/interop/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/interop
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/inuse/Makefile b/tests/sys/cddl/zfs/tests/inuse/Makefile
--- a/tests/sys/cddl/zfs/tests/inuse/Makefile
+++ b/tests/sys/cddl/zfs/tests/inuse/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/inuse
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/iscsi/Makefile b/tests/sys/cddl/zfs/tests/iscsi/Makefile
--- a/tests/sys/cddl/zfs/tests/iscsi/Makefile
+++ b/tests/sys/cddl/zfs/tests/iscsi/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/iscsi
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/large_files/Makefile b/tests/sys/cddl/zfs/tests/large_files/Makefile
--- a/tests/sys/cddl/zfs/tests/large_files/Makefile
+++ b/tests/sys/cddl/zfs/tests/large_files/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/large_files
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/largest_pool/Makefile b/tests/sys/cddl/zfs/tests/largest_pool/Makefile
--- a/tests/sys/cddl/zfs/tests/largest_pool/Makefile
+++ b/tests/sys/cddl/zfs/tests/largest_pool/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/largest_pool
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/link_count/Makefile b/tests/sys/cddl/zfs/tests/link_count/Makefile
--- a/tests/sys/cddl/zfs/tests/link_count/Makefile
+++ b/tests/sys/cddl/zfs/tests/link_count/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/link_count
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/migration/Makefile b/tests/sys/cddl/zfs/tests/migration/Makefile
--- a/tests/sys/cddl/zfs/tests/migration/Makefile
+++ b/tests/sys/cddl/zfs/tests/migration/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/migration
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/mmap/Makefile b/tests/sys/cddl/zfs/tests/mmap/Makefile
--- a/tests/sys/cddl/zfs/tests/mmap/Makefile
+++ b/tests/sys/cddl/zfs/tests/mmap/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/mount/Makefile b/tests/sys/cddl/zfs/tests/mount/Makefile
--- a/tests/sys/cddl/zfs/tests/mount/Makefile
+++ b/tests/sys/cddl/zfs/tests/mount/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mount
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/mv_files/Makefile b/tests/sys/cddl/zfs/tests/mv_files/Makefile
--- a/tests/sys/cddl/zfs/tests/mv_files/Makefile
+++ b/tests/sys/cddl/zfs/tests/mv_files/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mv_files
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/nestedfs/Makefile b/tests/sys/cddl/zfs/tests/nestedfs/Makefile
--- a/tests/sys/cddl/zfs/tests/nestedfs/Makefile
+++ b/tests/sys/cddl/zfs/tests/nestedfs/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/nestedfs
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/no_space/Makefile b/tests/sys/cddl/zfs/tests/no_space/Makefile
--- a/tests/sys/cddl/zfs/tests/no_space/Makefile
+++ b/tests/sys/cddl/zfs/tests/no_space/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/no_space
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/online_offline/Makefile b/tests/sys/cddl/zfs/tests/online_offline/Makefile
--- a/tests/sys/cddl/zfs/tests/online_offline/Makefile
+++ b/tests/sys/cddl/zfs/tests/online_offline/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/online_offline
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/pool_names/Makefile b/tests/sys/cddl/zfs/tests/pool_names/Makefile
--- a/tests/sys/cddl/zfs/tests/pool_names/Makefile
+++ b/tests/sys/cddl/zfs/tests/pool_names/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/pool_names
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/poolversion/Makefile b/tests/sys/cddl/zfs/tests/poolversion/Makefile
--- a/tests/sys/cddl/zfs/tests/poolversion/Makefile
+++ b/tests/sys/cddl/zfs/tests/poolversion/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/poolversion
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/quota/Makefile b/tests/sys/cddl/zfs/tests/quota/Makefile
--- a/tests/sys/cddl/zfs/tests/quota/Makefile
+++ b/tests/sys/cddl/zfs/tests/quota/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/quota
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/redundancy/Makefile b/tests/sys/cddl/zfs/tests/redundancy/Makefile
--- a/tests/sys/cddl/zfs/tests/redundancy/Makefile
+++ b/tests/sys/cddl/zfs/tests/redundancy/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/redundancy
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/refquota/Makefile b/tests/sys/cddl/zfs/tests/refquota/Makefile
--- a/tests/sys/cddl/zfs/tests/refquota/Makefile
+++ b/tests/sys/cddl/zfs/tests/refquota/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/refquota
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/refreserv/Makefile b/tests/sys/cddl/zfs/tests/refreserv/Makefile
--- a/tests/sys/cddl/zfs/tests/refreserv/Makefile
+++ b/tests/sys/cddl/zfs/tests/refreserv/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/refreserv
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/rename_dirs/Makefile b/tests/sys/cddl/zfs/tests/rename_dirs/Makefile
--- a/tests/sys/cddl/zfs/tests/rename_dirs/Makefile
+++ b/tests/sys/cddl/zfs/tests/rename_dirs/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/rename_dirs
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/replacement/Makefile b/tests/sys/cddl/zfs/tests/replacement/Makefile
--- a/tests/sys/cddl/zfs/tests/replacement/Makefile
+++ b/tests/sys/cddl/zfs/tests/replacement/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/replacement
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/rsend/Makefile b/tests/sys/cddl/zfs/tests/rsend/Makefile
--- a/tests/sys/cddl/zfs/tests/rsend/Makefile
+++ b/tests/sys/cddl/zfs/tests/rsend/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/rsend
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile b/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile
--- a/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile
+++ b/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/scrub_mirror
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/slog/Makefile b/tests/sys/cddl/zfs/tests/slog/Makefile
--- a/tests/sys/cddl/zfs/tests/slog/Makefile
+++ b/tests/sys/cddl/zfs/tests/slog/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/slog
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/snapshot/Makefile b/tests/sys/cddl/zfs/tests/snapshot/Makefile
--- a/tests/sys/cddl/zfs/tests/snapshot/Makefile
+++ b/tests/sys/cddl/zfs/tests/snapshot/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/snapshot
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/snapused/Makefile b/tests/sys/cddl/zfs/tests/snapused/Makefile
--- a/tests/sys/cddl/zfs/tests/snapused/Makefile
+++ b/tests/sys/cddl/zfs/tests/snapused/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/snapused
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/sparse/Makefile b/tests/sys/cddl/zfs/tests/sparse/Makefile
--- a/tests/sys/cddl/zfs/tests/sparse/Makefile
+++ b/tests/sys/cddl/zfs/tests/sparse/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/sparse
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/threadsappend/Makefile b/tests/sys/cddl/zfs/tests/threadsappend/Makefile
--- a/tests/sys/cddl/zfs/tests/threadsappend/Makefile
+++ b/tests/sys/cddl/zfs/tests/threadsappend/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/threadsappend
FILESDIR=${TESTSDIR}
BINDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/truncate/Makefile b/tests/sys/cddl/zfs/tests/truncate/Makefile
--- a/tests/sys/cddl/zfs/tests/truncate/Makefile
+++ b/tests/sys/cddl/zfs/tests/truncate/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/truncate
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/txg_integrity/Makefile b/tests/sys/cddl/zfs/tests/txg_integrity/Makefile
--- a/tests/sys/cddl/zfs/tests/txg_integrity/Makefile
+++ b/tests/sys/cddl/zfs/tests/txg_integrity/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/txg_integrity
FILESDIR=${TESTSDIR}
BINDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/userquota/Makefile b/tests/sys/cddl/zfs/tests/userquota/Makefile
--- a/tests/sys/cddl/zfs/tests/userquota/Makefile
+++ b/tests/sys/cddl/zfs/tests/userquota/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/userquota
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/utils_test/Makefile b/tests/sys/cddl/zfs/tests/utils_test/Makefile
--- a/tests/sys/cddl/zfs/tests/utils_test/Makefile
+++ b/tests/sys/cddl/zfs/tests/utils_test/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/utils_test
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/write_dirs/Makefile b/tests/sys/cddl/zfs/tests/write_dirs/Makefile
--- a/tests/sys/cddl/zfs/tests/write_dirs/Makefile
+++ b/tests/sys/cddl/zfs/tests/write_dirs/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/write_dirs
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/xattr/Makefile b/tests/sys/cddl/zfs/tests/xattr/Makefile
--- a/tests/sys/cddl/zfs/tests/xattr/Makefile
+++ b/tests/sys/cddl/zfs/tests/xattr/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/xattr
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zfsd/Makefile b/tests/sys/cddl/zfs/tests/zfsd/Makefile
--- a/tests/sys/cddl/zfs/tests/zfsd/Makefile
+++ b/tests/sys/cddl/zfs/tests/zfsd/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zfsd
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zil/Makefile b/tests/sys/cddl/zfs/tests/zil/Makefile
--- a/tests/sys/cddl/zfs/tests/zil/Makefile
+++ b/tests/sys/cddl/zfs/tests/zil/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zil
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zinject/Makefile b/tests/sys/cddl/zfs/tests/zinject/Makefile
--- a/tests/sys/cddl/zfs/tests/zinject/Makefile
+++ b/tests/sys/cddl/zfs/tests/zinject/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zinject
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zones/Makefile b/tests/sys/cddl/zfs/tests/zones/Makefile
--- a/tests/sys/cddl/zfs/tests/zones/Makefile
+++ b/tests/sys/cddl/zfs/tests/zones/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zones
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zvol/Makefile b/tests/sys/cddl/zfs/tests/zvol/Makefile
--- a/tests/sys/cddl/zfs/tests/zvol/Makefile
+++ b/tests/sys/cddl/zfs/tests/zvol/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile
--- a/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile
+++ b/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol/zvol_ENOSPC
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile
--- a/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile
+++ b/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol/zvol_cli
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile
--- a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile
+++ b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol/zvol_misc
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile
--- a/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile
+++ b/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol/zvol_swap
FILESDIR=${TESTSDIR}
diff --git a/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile b/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile
--- a/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile
+++ b/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile
@@ -1,6 +1,6 @@
.include <src.opts.mk>
-PACKAGE=tests
+PACKAGE=zfs-tests
TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/zvol_thrash
FILESDIR=${TESTSDIR}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 20, 12:36 PM (10 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41867789
Default Alt Text
D60928.1795178205.diff (115 KB)
Attached To
Mode
D60928: Don't some prune empty dirs created by BSD.tests.dist
Attached
Detach File
Event Timeline