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

after r298107

Summary of changes:

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

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

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

52 files changed, 52 insertions, 224 deletions

diff --git a/tests/Makefile b/tests/Makefile
index 92e462f..0aed9cf 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,22 +1,17 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-FILESGROUPS=	FILES
 PACKAGE= tests
-FILESGROUPS+=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-TESTS+=		Kyuafile
-
-SUBDIR+= etc
-SUBDIR+= sys
-SUBDIR_PARALLEL=
 
 TESTSDIR= ${TESTSBASE}
+
+${PACKAGE}FILES+=		README
+
 KYUAFILE= yes
 
-FILES+= README
-FILESDIR_README= ${TESTSDIR}
+SUBDIR+= etc
+SUBDIR+= sys
+
+SUBDIR_PARALLEL=
 
 afterinstall: install-tests-local
 install-tests-local: .PHONY
diff --git a/tests/etc/Makefile b/tests/etc/Makefile
index 6e02e32..1e49666 100644
--- a/tests/etc/Makefile
+++ b/tests/etc/Makefile
@@ -2,12 +2,6 @@
 
 .include <bsd.own.mk>
 
-FILESGROUPS=	FILES
-PACKAGE=	tests
-FILESGROUPS+=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-TESTS+=		Kyuafile
-
 TESTSDIR=	${TESTSBASE}/etc
 
 .PATH:		${SRCTOP}/tests
diff --git a/tests/etc/rc.d/Makefile b/tests/etc/rc.d/Makefile
index 3b946a3..368e8f4 100644
--- a/tests/etc/rc.d/Makefile
+++ b/tests/etc/rc.d/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/etc/rc.d
 
 ATF_TESTS_SH+=	routing_test
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 1d488bf..944e820 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -1,10 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR= ${TESTSBASE}/sys
 
 TESTS_SUBDIRS+=		acl
diff --git a/tests/sys/acl/Makefile b/tests/sys/acl/Makefile
index 7db6682..92789a2 100644
--- a/tests/sys/acl/Makefile
+++ b/tests/sys/acl/Makefile
@@ -1,17 +1,16 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/acl
 
 BINDIR=		${TESTSDIR}
 
-FILES+=		tools-crossfs.test
-FILES+=		tools-nfs4.test
-FILES+=		tools-nfs4-psarc.test
-FILES+=		tools-nfs4-trivial.test
-FILES+=		tools-posix.test
+${PACKAGE}FILES+=	tools-crossfs.test
+${PACKAGE}FILES+=	tools-nfs4.test
+${PACKAGE}FILES+=	tools-nfs4-psarc.test
+${PACKAGE}FILES+=	tools-nfs4-trivial.test
+${PACKAGE}FILES+=	tools-posix.test
 
 SCRIPTS+=	run
 
diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile
index 0003b84..98b4360 100644
--- a/tests/sys/aio/Makefile
+++ b/tests/sys/aio/Makefile
@@ -1,13 +1,11 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/aio
 
+ATF_TESTS_C+=	aio_test
+
 PLAIN_TESTS_C+=	aio_kqueue_test
 PLAIN_TESTS_C+=	lio_kqueue_test
-ATF_TESTS_C+=	aio_test
 
 LIBADD.aio_test+=	util
 
diff --git a/tests/sys/fifo/Makefile b/tests/sys/fifo/Makefile
index 750d5db..602bf1e 100644
--- a/tests/sys/fifo/Makefile
+++ b/tests/sys/fifo/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/fifo
 
 PLAIN_TESTS_C+=	fifo_create
diff --git a/tests/sys/file/Makefile b/tests/sys/file/Makefile
index 0b3c0fc..ed2d2c4 100644
--- a/tests/sys/file/Makefile
+++ b/tests/sys/file/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/file
 
 BINDIR=		${TESTSDIR}
diff --git a/tests/sys/geom/Makefile b/tests/sys/geom/Makefile
index e6ecc83..bf8604d 100644
--- a/tests/sys/geom/Makefile
+++ b/tests/sys/geom/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom
 
 TESTS_SUBDIRS+=	class
diff --git a/tests/sys/geom/class/Makefile b/tests/sys/geom/class/Makefile
index d4f6168..b633fd0 100644
--- a/tests/sys/geom/class/Makefile
+++ b/tests/sys/geom/class/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class
 
 TESTS_SUBDIRS+=	concat
@@ -17,8 +16,6 @@ TESTS_SUBDIRS+=	shsec
 TESTS_SUBDIRS+=	stripe
 TESTS_SUBDIRS+=	uzip
 
-BINDIR=		${TESTSDIR}
-
-FILES+=		geom_subr.sh
+${PACKAGE}FILES+=	geom_subr.sh
 
 .include <bsd.test.mk>
diff --git a/tests/sys/geom/class/concat/Makefile b/tests/sys/geom/class/concat/Makefile
index cd1eb61..b084996 100644
--- a/tests/sys/geom/class/concat/Makefile
+++ b/tests/sys/geom/class/concat/Makefile
@@ -1,17 +1,13 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
diff --git a/tests/sys/geom/class/eli/Makefile b/tests/sys/geom/class/eli/Makefile
index 65ee192..d827e1f 100644
--- a/tests/sys/geom/class/eli/Makefile
+++ b/tests/sys/geom/class/eli/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 TAP_TESTS_SH+= attach_d_test
 TAP_TESTS_SH+= configure_b_B_test
@@ -35,9 +33,7 @@ TEST_METADATA.integrity_hmac_test+=	timeout="600"
 TEST_METADATA.onetime_a_test+=	timeout="600"
 TEST_METADATA.onetime_test+=	timeout="600"
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
diff --git a/tests/sys/geom/class/gate/Makefile b/tests/sys/geom/class/gate/Makefile
index 25bcc2a..c034bf0 100644
--- a/tests/sys/geom/class/gate/Makefile
+++ b/tests/sys/geom/class/gate/Makefile
@@ -1,18 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test
 TAP_TESTS_SH+=	3_test
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
diff --git a/tests/sys/geom/class/mirror/Makefile b/tests/sys/geom/class/mirror/Makefile
index c2f732c..2665631 100644
--- a/tests/sys/geom/class/mirror/Makefile
+++ b/tests/sys/geom/class/mirror/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test
@@ -14,9 +12,7 @@ TAP_TESTS_SH+=	5_test
 TAP_TESTS_SH+=	6_test
 TAP_TESTS_SH+=	7_test
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
diff --git a/tests/sys/geom/class/nop/Makefile b/tests/sys/geom/class/nop/Makefile
index cd1eb61..b084996 100644
--- a/tests/sys/geom/class/nop/Makefile
+++ b/tests/sys/geom/class/nop/Makefile
@@ -1,17 +1,13 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
diff --git a/tests/sys/geom/class/raid3/Makefile b/tests/sys/geom/class/raid3/Makefile
index 3981ec7..a53a937 100644
--- a/tests/sys/geom/class/raid3/Makefile
+++ b/tests/sys/geom/class/raid3/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test
@@ -19,9 +17,7 @@ TAP_TESTS_SH+=	10_test
 TAP_TESTS_SH+=	11_test
 TAP_TESTS_SH+=	12_test
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
diff --git a/tests/sys/geom/class/shsec/Makefile b/tests/sys/geom/class/shsec/Makefile
index cd1eb61..b084996 100644
--- a/tests/sys/geom/class/shsec/Makefile
+++ b/tests/sys/geom/class/shsec/Makefile
@@ -1,17 +1,13 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
diff --git a/tests/sys/geom/class/stripe/Makefile b/tests/sys/geom/class/stripe/Makefile
index cd1eb61..b084996 100644
--- a/tests/sys/geom/class/stripe/Makefile
+++ b/tests/sys/geom/class/stripe/Makefile
@@ -1,17 +1,13 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+=		${FILES}
 
 TAP_TESTS_SH+=	1_test
 TAP_TESTS_SH+=	2_test
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh
 
 .for t in ${TAP_TESTS_SH}
 TEST_METADATA.$t+=	required_user="root"
diff --git a/tests/sys/geom/class/uzip/Makefile b/tests/sys/geom/class/uzip/Makefile
index 91c874e..89b643e 100644
--- a/tests/sys/geom/class/uzip/Makefile
+++ b/tests/sys/geom/class/uzip/Makefile
@@ -5,8 +5,7 @@
 #
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
 
 IMAGE=		1.img
@@ -26,16 +25,12 @@ ${UZIMAGE}: ${IMAGE} ${ZIMAGE}
 	printf "FreeBSD$$\n#\n\n" >> ${.TARGET}
 	uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET}
 
-FILES+=		conf.sh
-FILESNAME_conf.sh=	conf.sh
-
-FILES+=		${UZIMAGE}
-FILESDIR=	${TESTSDIR}
+${PACKAGE}FILES+=		conf.sh \
+				${UZIMAGE}
 
-FILESGROUPS+=	FILES etalon
+FILESGROUPS+=	etalon
 etalon+=	etalon/etalon.txt
 etalonDIR=	${TESTSDIR}/etalon
-FILESPACKAGE=	${PACKAGE}
 etalonPACKAGE=	${PACKAGE}
 
 TAP_TESTS_SH+=	1_test
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index 4a24a40..ee9959e 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/kernel
 .PATH:		${SRCTOP}/sys/kern
 
diff --git a/tests/sys/kern/acct/Makefile b/tests/sys/kern/acct/Makefile
index 3a9a7ec..ca3df4c 100644
--- a/tests/sys/kern/acct/Makefile
+++ b/tests/sys/kern/acct/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/kern/acct
 
 ATF_TESTS_C=	acct_test
diff --git a/tests/sys/kern/execve/Makefile b/tests/sys/kern/execve/Makefile
index a029b8f..82c5d4b 100644
--- a/tests/sys/kern/execve/Makefile
+++ b/tests/sys/kern/execve/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/kern/execve
 
 BINDIR=		${TESTSDIR}
diff --git a/tests/sys/kern/pipe/Makefile b/tests/sys/kern/pipe/Makefile
index bcc61b4..bcd2d07 100644
--- a/tests/sys/kern/pipe/Makefile
+++ b/tests/sys/kern/pipe/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/kern/pipe
 
 PLAIN_TESTS_C+= big_pipe_test
diff --git a/tests/sys/kqueue/Makefile b/tests/sys/kqueue/Makefile
index 2ec462a..43277ca 100644
--- a/tests/sys/kqueue/Makefile
+++ b/tests/sys/kqueue/Makefile
@@ -6,9 +6,6 @@
 # libkqueue and test suite by Mark Heily <mark@heily.com>
 #
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TAP_TESTS_SH=	kqueue_test
 
 TESTSDIR=	${TESTSBASE}/sys/kqueue
diff --git a/tests/sys/mac/Makefile b/tests/sys/mac/Makefile
index db91895..ae2c491 100644
--- a/tests/sys/mac/Makefile
+++ b/tests/sys/mac/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/mac
 
 TESTS_SUBDIRS+=	bsdextended
diff --git a/tests/sys/mac/bsdextended/Makefile b/tests/sys/mac/bsdextended/Makefile
index 8fdee52..9d0b6f6 100644
--- a/tests/sys/mac/bsdextended/Makefile
+++ b/tests/sys/mac/bsdextended/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/mac/bsdextended
 
 TAP_TESTS_C+=	ugidfw_test
diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile
index b894c8c..6564ef9 100644
--- a/tests/sys/mac/portacl/Makefile
+++ b/tests/sys/mac/portacl/Makefile
@@ -1,12 +1,10 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/mac/portacl
-BINDIR=		${TESTSDIR}
 
-FILES+=		misc.sh
+${PACKAGE}FILES+=	misc.sh
 
 TAP_TESTS_SH+=	nobody_test
 TAP_TESTS_SH+=	root_test
diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile
index 6ccd275..ce5033c 100644
--- a/tests/sys/mqueue/Makefile
+++ b/tests/sys/mqueue/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/mqueue
 
 ATF_TESTS_SH=	mqueue_test
diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile
index 4fe2922..14cee19 100644
--- a/tests/sys/netinet/Makefile
+++ b/tests/sys/netinet/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/netinet
 BINDIR=		${TESTSDIR}
 
 ATF_TESTS_SH=	fibs_test
+
 PROGS=	udp_dontroute
+
 MAN=
+
 WARNS?=	6
 
 .include <bsd.test.mk>
diff --git a/tests/sys/opencrypto/Makefile b/tests/sys/opencrypto/Makefile
index 96cc86b..17b9850 100644
--- a/tests/sys/opencrypto/Makefile
+++ b/tests/sys/opencrypto/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/opencrypto
 BINDIR=		${TESTSDIR}
 
@@ -11,7 +10,6 @@ PLAIN_TESTS_SH=	runtests
 TEST_METADATA.foo+=required_programs="python"
 PYMODULES=	cryptodev.py cryptodevh.py cryptotest.py dpkt.py
 
-FILESDIR=	${TESTSDIR}
-FILES=		${PYMODULES}
+${PACKAGE}FILES+=	${PYMODULES}
 
 .include <bsd.test.mk>
diff --git a/tests/sys/pjdfstest/Makefile b/tests/sys/pjdfstest/Makefile
index 65f562a..7761302 100644
--- a/tests/sys/pjdfstest/Makefile
+++ b/tests/sys/pjdfstest/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 SUBDIR+=	pjdfstest
 SUBDIR+=	tests
+
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile
index 8ae74e7..0d47366 100644
--- a/tests/sys/pjdfstest/pjdfstest/Makefile
+++ b/tests/sys/pjdfstest/pjdfstest/Makefile
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-TOP=		${.CURDIR:H:H:H:H}
 
-.PATH: ${TOP}/contrib/pjdfstest
+.PATH: ${SRCTOP}/contrib/pjdfstest
 
 BINDIR=		${TESTSBASE}/sys/pjdfstest
 PROG=		pjdfstest
diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile
index 951ac9a..f3757f2 100644
--- a/tests/sys/pjdfstest/tests/Makefile
+++ b/tests/sys/pjdfstest/tests/Makefile
@@ -1,17 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 PJDFSTEST_SRCDIR=	${SRCTOP}/contrib/pjdfstest
 
 TESTSDIR=	${TESTSBASE}/sys/pjdfstest
 
 .PATH: ${.CURDIR}
 
-FILESDIR=	${TESTSDIR}
-FILES=		conf
-FILES+=		misc.sh
+${PACKAGE}FILES+=	conf
+${PACKAGE}FILES+=	misc.sh
 CLEANFILES+=	misc.sh misc.sh.tmp
 
 misc.sh: ${PJDFSTEST_SRCDIR}/tests/misc.sh
diff --git a/tests/sys/pjdfstest/tests/chflags/Makefile b/tests/sys/pjdfstest/tests/chflags/Makefile
index 2865f9d..3b6a526 100644
--- a/tests/sys/pjdfstest/tests/chflags/Makefile
+++ b/tests/sys/pjdfstest/tests/chflags/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/chmod/Makefile b/tests/sys/pjdfstest/tests/chmod/Makefile
index 10227c1..cc0a3bb 100644
--- a/tests/sys/pjdfstest/tests/chmod/Makefile
+++ b/tests/sys/pjdfstest/tests/chmod/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/chown/Makefile b/tests/sys/pjdfstest/tests/chown/Makefile
index f8fa004..665b653 100644
--- a/tests/sys/pjdfstest/tests/chown/Makefile
+++ b/tests/sys/pjdfstest/tests/chown/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/ftruncate/Makefile b/tests/sys/pjdfstest/tests/ftruncate/Makefile
index 67570a8..da2ce58 100644
--- a/tests/sys/pjdfstest/tests/ftruncate/Makefile
+++ b/tests/sys/pjdfstest/tests/ftruncate/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/granular/Makefile b/tests/sys/pjdfstest/tests/granular/Makefile
index 4f0d071..3f935e4 100644
--- a/tests/sys/pjdfstest/tests/granular/Makefile
+++ b/tests/sys/pjdfstest/tests/granular/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/link/Makefile b/tests/sys/pjdfstest/tests/link/Makefile
index af74c4a..14c7525 100644
--- a/tests/sys/pjdfstest/tests/link/Makefile
+++ b/tests/sys/pjdfstest/tests/link/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/mkdir/Makefile b/tests/sys/pjdfstest/tests/mkdir/Makefile
index 10227c1..cc0a3bb 100644
--- a/tests/sys/pjdfstest/tests/mkdir/Makefile
+++ b/tests/sys/pjdfstest/tests/mkdir/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/mkfifo/Makefile b/tests/sys/pjdfstest/tests/mkfifo/Makefile
index 10227c1..cc0a3bb 100644
--- a/tests/sys/pjdfstest/tests/mkfifo/Makefile
+++ b/tests/sys/pjdfstest/tests/mkfifo/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/mknod/Makefile b/tests/sys/pjdfstest/tests/mknod/Makefile
index fd41522..1eaeaa0 100644
--- a/tests/sys/pjdfstest/tests/mknod/Makefile
+++ b/tests/sys/pjdfstest/tests/mknod/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/open/Makefile b/tests/sys/pjdfstest/tests/open/Makefile
index c66cc3e..bd2f7b5 100644
--- a/tests/sys/pjdfstest/tests/open/Makefile
+++ b/tests/sys/pjdfstest/tests/open/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/rename/Makefile b/tests/sys/pjdfstest/tests/rename/Makefile
index 86984d9..7eada04 100644
--- a/tests/sys/pjdfstest/tests/rename/Makefile
+++ b/tests/sys/pjdfstest/tests/rename/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/rmdir/Makefile b/tests/sys/pjdfstest/tests/rmdir/Makefile
index 31fd8ba..301e4e5 100644
--- a/tests/sys/pjdfstest/tests/rmdir/Makefile
+++ b/tests/sys/pjdfstest/tests/rmdir/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/symlink/Makefile b/tests/sys/pjdfstest/tests/symlink/Makefile
index 10227c1..cc0a3bb 100644
--- a/tests/sys/pjdfstest/tests/symlink/Makefile
+++ b/tests/sys/pjdfstest/tests/symlink/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/truncate/Makefile b/tests/sys/pjdfstest/tests/truncate/Makefile
index 67570a8..da2ce58 100644
--- a/tests/sys/pjdfstest/tests/truncate/Makefile
+++ b/tests/sys/pjdfstest/tests/truncate/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/pjdfstest/tests/unlink/Makefile b/tests/sys/pjdfstest/tests/unlink/Makefile
index 2865f9d..3b6a526 100644
--- a/tests/sys/pjdfstest/tests/unlink/Makefile
+++ b/tests/sys/pjdfstest/tests/unlink/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
diff --git a/tests/sys/posixshm/Makefile b/tests/sys/posixshm/Makefile
index aab71d1..6e9e345 100644
--- a/tests/sys/posixshm/Makefile
+++ b/tests/sys/posixshm/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/posixshm
 
 ATF_TESTS_C+=	posixshm_test
diff --git a/tests/sys/sys/Makefile b/tests/sys/sys/Makefile
index eee6d73..3adf6b8 100644
--- a/tests/sys/sys/Makefile
+++ b/tests/sys/sys/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TESTSDIR=	${TESTSBASE}/sys/sys
 
 ATF_TESTS_C=	bitstring_test
diff --git a/tests/sys/vfs/Makefile b/tests/sys/vfs/Makefile
index 09e4518..cbab7e5 100644
--- a/tests/sys/vfs/Makefile
+++ b/tests/sys/vfs/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=		${TESTSBASE}/sys/vfs
 
 PLAIN_TESTS_SH+=	trailing_slash
diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile
index 9d1be8b..a3c298b 100644
--- a/tests/sys/vm/Makefile
+++ b/tests/sys/vm/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/sys/vm
 
 ATF_TESTS_C+=	mmap_test