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

19 files changed, 451 insertions, 526 deletions

diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile
index effd839..2f4f70c 100644
--- a/bin/cat/tests/Makefile
+++ b/bin/cat/tests/Makefile
@@ -1,15 +1,11 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 
 NETBSD_ATF_TESTS_SH=		cat_test
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		d_align.in
-FILES+=		d_align.out
+${PACKAGE}FILES+=		d_align.in
+${PACKAGE}FILES+=		d_align.out
 
 .include <netbsd-tests.test.mk>
 
diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile
index cffb43f..64d86d2 100644
--- a/bin/date/tests/Makefile
+++ b/bin/date/tests/Makefile
@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 ATF_TESTS_SH=	format_string_test
 
 .include <bsd.test.mk>
diff --git a/bin/dd/tests/Makefile b/bin/dd/tests/Makefile
index ad97671..dd04af9 100644
--- a/bin/dd/tests/Makefile
+++ b/bin/dd/tests/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 NETBSD_ATF_TESTS_SH=	dd_test
 
 .include <netbsd-tests.test.mk>
diff --git a/bin/expr/tests/Makefile b/bin/expr/tests/Makefile
index 90331d0..21b0e99 100644
--- a/bin/expr/tests/Makefile
+++ b/bin/expr/tests/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 NETBSD_ATF_TESTS_SH=	expr_test
 
 ATF_TESTS_SH_SED_expr_test+=	-e 's/eval expr/eval expr --/g'
diff --git a/bin/ls/tests/Makefile b/bin/ls/tests/Makefile
index 2c3045b..89a2e8c 100644
--- a/bin/ls/tests/Makefile
+++ b/bin/ls/tests/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 ATF_TESTS_SH+=	ls_tests
 # This seems like overkill, but the idea in mind is that all of the testcases
 # should be runnable as !root
diff --git a/bin/mv/tests/Makefile b/bin/mv/tests/Makefile
index 62bc207..229d96e 100644
--- a/bin/mv/tests/Makefile
+++ b/bin/mv/tests/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	legacy_test
 
 .include <bsd.test.mk>
diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile
index 6e22087..8334fea 100644
--- a/bin/pax/tests/Makefile
+++ b/bin/pax/tests/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_PERL=	legacy_test
 
 .include <bsd.test.mk>
diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile
index d6edfae..be46707 100644
--- a/bin/pkill/tests/Makefile
+++ b/bin/pkill/tests/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=			pgrep-F_test
 TAP_TESTS_SH+=			pgrep-LF_test
 TAP_TESTS_SH+=			pgrep-P_test
diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile
index 58834a4..d93e19a 100644
--- a/bin/sh/tests/Makefile
+++ b/bin/sh/tests/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TESTS_SUBDIRS+=	builtins
 TESTS_SUBDIRS+=	errors
 TESTS_SUBDIRS+=	execution
diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile
index b323daf..bd23550 100644
--- a/bin/sh/tests/builtins/Makefile
+++ b/bin/sh/tests/builtins/Makefile
@@ -1,181 +1,178 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+
 .include <src.opts.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		alias.0 alias.0.stdout
-FILES+=		alias.1 alias.1.stderr
-FILES+=		alias3.0 alias3.0.stdout
-FILES+=		alias4.0
-FILES+=		break1.0
-FILES+=		break2.0 break2.0.stdout
-FILES+=		break3.0
-FILES+=		break4.4
-FILES+=		break5.4
-FILES+=		break6.0
-FILES+=		builtin1.0
-FILES+=		case1.0
-FILES+=		case2.0
-FILES+=		case3.0
-FILES+=		case4.0
-FILES+=		case5.0
-FILES+=		case6.0
-FILES+=		case7.0
-FILES+=		case8.0
-FILES+=		case9.0
-FILES+=		case10.0
-FILES+=		case11.0
-FILES+=		case12.0
-FILES+=		case13.0
-FILES+=		case14.0
-FILES+=		case15.0
-FILES+=		case16.0
-FILES+=		case17.0
-FILES+=		case18.0
-FILES+=		case19.0
-FILES+=		case20.0
-FILES+=		cd1.0
-FILES+=		cd2.0
-FILES+=		cd3.0
-FILES+=		cd4.0
-FILES+=		cd5.0
-FILES+=		cd6.0
-FILES+=		cd7.0
-FILES+=		cd8.0
-FILES+=		cd9.0 cd9.0.stdout
-FILES+=		command1.0
-FILES+=		command2.0
-FILES+=		command3.0
-FILES+=		command3.0.stdout
-FILES+=		command4.0
-FILES+=		command5.0
-FILES+=		command5.0.stdout
-FILES+=		command6.0
-FILES+=		command6.0.stdout
-FILES+=		command7.0
-FILES+=		command8.0
-FILES+=		command9.0
-FILES+=		command10.0
-FILES+=		command11.0
-FILES+=		command12.0
-FILES+=		dot1.0
-FILES+=		dot2.0
-FILES+=		dot3.0
-FILES+=		dot4.0
-FILES+=		eval1.0
-FILES+=		eval2.0
-FILES+=		eval3.0
-FILES+=		eval4.0
-FILES+=		eval5.0
-FILES+=		eval6.0
-FILES+=		eval7.0
-FILES+=		eval8.7
-FILES+=		exec1.0
-FILES+=		exec2.0
-FILES+=		exit1.0
-FILES+=		exit2.8
-FILES+=		exit3.0
-FILES+=		export1.0
-FILES+=		fc1.0
-FILES+=		fc2.0
-FILES+=		for1.0
-FILES+=		for2.0
-FILES+=		for3.0
-FILES+=		getopts1.0 getopts1.0.stdout
-FILES+=		getopts2.0 getopts2.0.stdout
-FILES+=		getopts3.0
-FILES+=		getopts4.0
-FILES+=		getopts5.0
-FILES+=		getopts6.0
-FILES+=		getopts7.0
-FILES+=		getopts8.0 getopts8.0.stdout
-FILES+=		getopts9.0 getopts9.0.stdout
-FILES+=		getopts10.0
-FILES+=		hash1.0 hash1.0.stdout
-FILES+=		hash2.0 hash2.0.stdout
-FILES+=		hash3.0 hash3.0.stdout
-FILES+=		hash4.0
-FILES+=		jobid1.0
-FILES+=		jobid2.0
-FILES+=		kill1.0 kill2.0
-FILES+=		lineno.0 lineno.0.stdout
-FILES+=		lineno2.0
-FILES+=		lineno3.0 lineno3.0.stdout
-FILES+=		local1.0
-FILES+=		local2.0
-FILES+=		local3.0
-FILES+=		local4.0
-FILES+=		local5.0
-FILES+=		local6.0
-FILES+=		local7.0
+${PACKAGE}FILES+=		alias.0 alias.0.stdout
+${PACKAGE}FILES+=		alias.1 alias.1.stderr
+${PACKAGE}FILES+=		alias3.0 alias3.0.stdout
+${PACKAGE}FILES+=		alias4.0
+${PACKAGE}FILES+=		break1.0
+${PACKAGE}FILES+=		break2.0 break2.0.stdout
+${PACKAGE}FILES+=		break3.0
+${PACKAGE}FILES+=		break4.4
+${PACKAGE}FILES+=		break5.4
+${PACKAGE}FILES+=		break6.0
+${PACKAGE}FILES+=		builtin1.0
+${PACKAGE}FILES+=		case1.0
+${PACKAGE}FILES+=		case2.0
+${PACKAGE}FILES+=		case3.0
+${PACKAGE}FILES+=		case4.0
+${PACKAGE}FILES+=		case5.0
+${PACKAGE}FILES+=		case6.0
+${PACKAGE}FILES+=		case7.0
+${PACKAGE}FILES+=		case8.0
+${PACKAGE}FILES+=		case9.0
+${PACKAGE}FILES+=		case10.0
+${PACKAGE}FILES+=		case11.0
+${PACKAGE}FILES+=		case12.0
+${PACKAGE}FILES+=		case13.0
+${PACKAGE}FILES+=		case14.0
+${PACKAGE}FILES+=		case15.0
+${PACKAGE}FILES+=		case16.0
+${PACKAGE}FILES+=		case17.0
+${PACKAGE}FILES+=		case18.0
+${PACKAGE}FILES+=		case19.0
+${PACKAGE}FILES+=		case20.0
+${PACKAGE}FILES+=		cd1.0
+${PACKAGE}FILES+=		cd2.0
+${PACKAGE}FILES+=		cd3.0
+${PACKAGE}FILES+=		cd4.0
+${PACKAGE}FILES+=		cd5.0
+${PACKAGE}FILES+=		cd6.0
+${PACKAGE}FILES+=		cd7.0
+${PACKAGE}FILES+=		cd8.0
+${PACKAGE}FILES+=		cd9.0 cd9.0.stdout
+${PACKAGE}FILES+=		command1.0
+${PACKAGE}FILES+=		command2.0
+${PACKAGE}FILES+=		command3.0
+${PACKAGE}FILES+=		command3.0.stdout
+${PACKAGE}FILES+=		command4.0
+${PACKAGE}FILES+=		command5.0
+${PACKAGE}FILES+=		command5.0.stdout
+${PACKAGE}FILES+=		command6.0
+${PACKAGE}FILES+=		command6.0.stdout
+${PACKAGE}FILES+=		command7.0
+${PACKAGE}FILES+=		command8.0
+${PACKAGE}FILES+=		command9.0
+${PACKAGE}FILES+=		command10.0
+${PACKAGE}FILES+=		command11.0
+${PACKAGE}FILES+=		command12.0
+${PACKAGE}FILES+=		dot1.0
+${PACKAGE}FILES+=		dot2.0
+${PACKAGE}FILES+=		dot3.0
+${PACKAGE}FILES+=		dot4.0
+${PACKAGE}FILES+=		eval1.0
+${PACKAGE}FILES+=		eval2.0
+${PACKAGE}FILES+=		eval3.0
+${PACKAGE}FILES+=		eval4.0
+${PACKAGE}FILES+=		eval5.0
+${PACKAGE}FILES+=		eval6.0
+${PACKAGE}FILES+=		eval7.0
+${PACKAGE}FILES+=		eval8.7
+${PACKAGE}FILES+=		exec1.0
+${PACKAGE}FILES+=		exec2.0
+${PACKAGE}FILES+=		exit1.0
+${PACKAGE}FILES+=		exit2.8
+${PACKAGE}FILES+=		exit3.0
+${PACKAGE}FILES+=		export1.0
+${PACKAGE}FILES+=		fc1.0
+${PACKAGE}FILES+=		fc2.0
+${PACKAGE}FILES+=		for1.0
+${PACKAGE}FILES+=		for2.0
+${PACKAGE}FILES+=		for3.0
+${PACKAGE}FILES+=		getopts1.0 getopts1.0.stdout
+${PACKAGE}FILES+=		getopts2.0 getopts2.0.stdout
+${PACKAGE}FILES+=		getopts3.0
+${PACKAGE}FILES+=		getopts4.0
+${PACKAGE}FILES+=		getopts5.0
+${PACKAGE}FILES+=		getopts6.0
+${PACKAGE}FILES+=		getopts7.0
+${PACKAGE}FILES+=		getopts8.0 getopts8.0.stdout
+${PACKAGE}FILES+=		getopts9.0 getopts9.0.stdout
+${PACKAGE}FILES+=		getopts10.0
+${PACKAGE}FILES+=		hash1.0 hash1.0.stdout
+${PACKAGE}FILES+=		hash2.0 hash2.0.stdout
+${PACKAGE}FILES+=		hash3.0 hash3.0.stdout
+${PACKAGE}FILES+=		hash4.0
+${PACKAGE}FILES+=		jobid1.0
+${PACKAGE}FILES+=		jobid2.0
+${PACKAGE}FILES+=		kill1.0 kill2.0
+${PACKAGE}FILES+=		lineno.0 lineno.0.stdout
+${PACKAGE}FILES+=		lineno2.0
+${PACKAGE}FILES+=		lineno3.0 lineno3.0.stdout
+${PACKAGE}FILES+=		local1.0
+${PACKAGE}FILES+=		local2.0
+${PACKAGE}FILES+=		local3.0
+${PACKAGE}FILES+=		local4.0
+${PACKAGE}FILES+=		local5.0
+${PACKAGE}FILES+=		local6.0
+${PACKAGE}FILES+=		local7.0
 .if ${MK_NLS} != "no"
-FILES+=		locale1.0
+${PACKAGE}FILES+=		locale1.0
 .endif
-FILES+=		printf1.0
-FILES+=		printf2.0
-FILES+=		printf3.0
-FILES+=		printf4.0
-FILES+=		read1.0 read1.0.stdout
-FILES+=		read2.0
-FILES+=		read3.0 read3.0.stdout
-FILES+=		read4.0 read4.0.stdout
-FILES+=		read5.0
-FILES+=		read6.0
-FILES+=		read7.0
-FILES+=		read8.0
-FILES+=		read9.0
-FILES+=		return1.0
-FILES+=		return2.1
-FILES+=		return3.1
-FILES+=		return4.0
-FILES+=		return5.0
-FILES+=		return6.4
-FILES+=		return7.4
-FILES+=		return8.0
-FILES+=		set1.0
-FILES+=		set2.0
-FILES+=		set3.0
-FILES+=		trap1.0
-FILES+=		trap10.0
-FILES+=		trap11.0
-FILES+=		trap12.0
-FILES+=		trap13.0
-FILES+=		trap14.0
-FILES+=		trap15.0
-FILES+=		trap16.0
-FILES+=		trap17.0
-FILES+=		trap2.0
-FILES+=		trap3.0
-FILES+=		trap4.0
-FILES+=		trap5.0
-FILES+=		trap6.0
-FILES+=		trap7.0
-FILES+=		trap8.0
-FILES+=		trap9.0
-FILES+=		type1.0 type1.0.stderr
-FILES+=		type2.0
-FILES+=		type3.0
-FILES+=		unalias.0
-FILES+=		var-assign.0
-FILES+=		var-assign2.0
-FILES+=		wait1.0
-FILES+=		wait2.0
-FILES+=		wait3.0
-FILES+=		wait4.0
-FILES+=		wait5.0
-FILES+=		wait6.0
-FILES+=		wait7.0
-FILES+=		wait8.0
-FILES+=		wait9.127
-FILES+=		wait10.0
+${PACKAGE}FILES+=		printf1.0
+${PACKAGE}FILES+=		printf2.0
+${PACKAGE}FILES+=		printf3.0
+${PACKAGE}FILES+=		printf4.0
+${PACKAGE}FILES+=		read1.0 read1.0.stdout
+${PACKAGE}FILES+=		read2.0
+${PACKAGE}FILES+=		read3.0 read3.0.stdout
+${PACKAGE}FILES+=		read4.0 read4.0.stdout
+${PACKAGE}FILES+=		read5.0
+${PACKAGE}FILES+=		read6.0
+${PACKAGE}FILES+=		read7.0
+${PACKAGE}FILES+=		read8.0
+${PACKAGE}FILES+=		read9.0
+${PACKAGE}FILES+=		return1.0
+${PACKAGE}FILES+=		return2.1
+${PACKAGE}FILES+=		return3.1
+${PACKAGE}FILES+=		return4.0
+${PACKAGE}FILES+=		return5.0
+${PACKAGE}FILES+=		return6.4
+${PACKAGE}FILES+=		return7.4
+${PACKAGE}FILES+=		return8.0
+${PACKAGE}FILES+=		set1.0
+${PACKAGE}FILES+=		set2.0
+${PACKAGE}FILES+=		set3.0
+${PACKAGE}FILES+=		trap1.0
+${PACKAGE}FILES+=		trap10.0
+${PACKAGE}FILES+=		trap11.0
+${PACKAGE}FILES+=		trap12.0
+${PACKAGE}FILES+=		trap13.0
+${PACKAGE}FILES+=		trap14.0
+${PACKAGE}FILES+=		trap15.0
+${PACKAGE}FILES+=		trap16.0
+${PACKAGE}FILES+=		trap17.0
+${PACKAGE}FILES+=		trap2.0
+${PACKAGE}FILES+=		trap3.0
+${PACKAGE}FILES+=		trap4.0
+${PACKAGE}FILES+=		trap5.0
+${PACKAGE}FILES+=		trap6.0
+${PACKAGE}FILES+=		trap7.0
+${PACKAGE}FILES+=		trap8.0
+${PACKAGE}FILES+=		trap9.0
+${PACKAGE}FILES+=		type1.0 type1.0.stderr
+${PACKAGE}FILES+=		type2.0
+${PACKAGE}FILES+=		type3.0
+${PACKAGE}FILES+=		unalias.0
+${PACKAGE}FILES+=		var-assign.0
+${PACKAGE}FILES+=		var-assign2.0
+${PACKAGE}FILES+=		wait1.0
+${PACKAGE}FILES+=		wait2.0
+${PACKAGE}FILES+=		wait3.0
+${PACKAGE}FILES+=		wait4.0
+${PACKAGE}FILES+=		wait5.0
+${PACKAGE}FILES+=		wait6.0
+${PACKAGE}FILES+=		wait7.0
+${PACKAGE}FILES+=		wait8.0
+${PACKAGE}FILES+=		wait9.127
+${PACKAGE}FILES+=		wait10.0
 
 .include <bsd.test.mk>
diff --git a/bin/sh/tests/errors/Makefile b/bin/sh/tests/errors/Makefile
index f7c7e26..c50417c 100644
--- a/bin/sh/tests/errors/Makefile
+++ b/bin/sh/tests/errors/Makefile
@@ -1,37 +1,34 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		assignment-error1.0
-FILES+=		assignment-error2.0
-FILES+=		backquote-error1.0
-FILES+=		backquote-error2.0
-FILES+=		bad-binary1.126
-FILES+=		bad-keyword1.0
-FILES+=		bad-parm-exp1.0
-FILES+=		bad-parm-exp2.2 bad-parm-exp2.2.stderr
-FILES+=		bad-parm-exp3.2 bad-parm-exp3.2.stderr
-FILES+=		bad-parm-exp4.2 bad-parm-exp4.2.stderr
-FILES+=		bad-parm-exp5.2 bad-parm-exp5.2.stderr
-FILES+=		bad-parm-exp6.2 bad-parm-exp6.2.stderr
-FILES+=		bad-parm-exp7.0
-FILES+=		bad-parm-exp8.0
-FILES+=		option-error.0
-FILES+=		redirection-error.0
-FILES+=		redirection-error2.2
-FILES+=		redirection-error3.0
-FILES+=		redirection-error4.0
-FILES+=		redirection-error5.0
-FILES+=		redirection-error6.0
-FILES+=		redirection-error7.0
-FILES+=		write-error1.0
+${PACKAGE}FILES+=		assignment-error1.0
+${PACKAGE}FILES+=		assignment-error2.0
+${PACKAGE}FILES+=		backquote-error1.0
+${PACKAGE}FILES+=		backquote-error2.0
+${PACKAGE}FILES+=		bad-binary1.126
+${PACKAGE}FILES+=		bad-keyword1.0
+${PACKAGE}FILES+=		bad-parm-exp1.0
+${PACKAGE}FILES+=		bad-parm-exp2.2 bad-parm-exp2.2.stderr
+${PACKAGE}FILES+=		bad-parm-exp3.2 bad-parm-exp3.2.stderr
+${PACKAGE}FILES+=		bad-parm-exp4.2 bad-parm-exp4.2.stderr
+${PACKAGE}FILES+=		bad-parm-exp5.2 bad-parm-exp5.2.stderr
+${PACKAGE}FILES+=		bad-parm-exp6.2 bad-parm-exp6.2.stderr
+${PACKAGE}FILES+=		bad-parm-exp7.0
+${PACKAGE}FILES+=		bad-parm-exp8.0
+${PACKAGE}FILES+=		option-error.0
+${PACKAGE}FILES+=		redirection-error.0
+${PACKAGE}FILES+=		redirection-error2.2
+${PACKAGE}FILES+=		redirection-error3.0
+${PACKAGE}FILES+=		redirection-error4.0
+${PACKAGE}FILES+=		redirection-error5.0
+${PACKAGE}FILES+=		redirection-error6.0
+${PACKAGE}FILES+=		redirection-error7.0
+${PACKAGE}FILES+=		write-error1.0
 
 .include <bsd.test.mk>
diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile
index 64d12de..92aecc8 100644
--- a/bin/sh/tests/execution/Makefile
+++ b/bin/sh/tests/execution/Makefile
@@ -1,59 +1,56 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		bg1.0
-FILES+=		bg2.0
-FILES+=		bg3.0
-FILES+=		bg4.0
-FILES+=		bg5.0
-FILES+=		bg6.0 bg6.0.stdout
-FILES+=		bg7.0
-FILES+=		bg8.0
-FILES+=		bg9.0
-FILES+=		bg10.0 bg10.0.stdout
-FILES+=		fork1.0
-FILES+=		fork2.0
-FILES+=		fork3.0
-FILES+=		func1.0
-FILES+=		func2.0
-FILES+=		func3.0
-FILES+=		hash1.0
-FILES+=		int-cmd1.0
-FILES+=		killed1.0
-FILES+=		killed2.0
-FILES+=		not1.0
-FILES+=		not2.0
-FILES+=		path1.0
-FILES+=		redir1.0
-FILES+=		redir2.0
-FILES+=		redir3.0
-FILES+=		redir4.0
-FILES+=		redir5.0
-FILES+=		redir6.0
-FILES+=		redir7.0
-FILES+=		set-n1.0
-FILES+=		set-n2.0
-FILES+=		set-n3.0
-FILES+=		set-n4.0
-FILES+=		set-x1.0
-FILES+=		set-x2.0
-FILES+=		set-x3.0
-FILES+=		set-x4.0
-FILES+=		shellproc1.0
-FILES+=		subshell1.0 subshell1.0.stdout
-FILES+=		subshell2.0
-FILES+=		subshell3.0
-FILES+=		subshell4.0
-FILES+=		unknown1.0
-FILES+=		var-assign1.0
+${PACKAGE}FILES+=		bg1.0
+${PACKAGE}FILES+=		bg2.0
+${PACKAGE}FILES+=		bg3.0
+${PACKAGE}FILES+=		bg4.0
+${PACKAGE}FILES+=		bg5.0
+${PACKAGE}FILES+=		bg6.0 bg6.0.stdout
+${PACKAGE}FILES+=		bg7.0
+${PACKAGE}FILES+=		bg8.0
+${PACKAGE}FILES+=		bg9.0
+${PACKAGE}FILES+=		bg10.0 bg10.0.stdout
+${PACKAGE}FILES+=		fork1.0
+${PACKAGE}FILES+=		fork2.0
+${PACKAGE}FILES+=		fork3.0
+${PACKAGE}FILES+=		func1.0
+${PACKAGE}FILES+=		func2.0
+${PACKAGE}FILES+=		func3.0
+${PACKAGE}FILES+=		hash1.0
+${PACKAGE}FILES+=		int-cmd1.0
+${PACKAGE}FILES+=		killed1.0
+${PACKAGE}FILES+=		killed2.0
+${PACKAGE}FILES+=		not1.0
+${PACKAGE}FILES+=		not2.0
+${PACKAGE}FILES+=		path1.0
+${PACKAGE}FILES+=		redir1.0
+${PACKAGE}FILES+=		redir2.0
+${PACKAGE}FILES+=		redir3.0
+${PACKAGE}FILES+=		redir4.0
+${PACKAGE}FILES+=		redir5.0
+${PACKAGE}FILES+=		redir6.0
+${PACKAGE}FILES+=		redir7.0
+${PACKAGE}FILES+=		set-n1.0
+${PACKAGE}FILES+=		set-n2.0
+${PACKAGE}FILES+=		set-n3.0
+${PACKAGE}FILES+=		set-n4.0
+${PACKAGE}FILES+=		set-x1.0
+${PACKAGE}FILES+=		set-x2.0
+${PACKAGE}FILES+=		set-x3.0
+${PACKAGE}FILES+=		set-x4.0
+${PACKAGE}FILES+=		shellproc1.0
+${PACKAGE}FILES+=		subshell1.0 subshell1.0.stdout
+${PACKAGE}FILES+=		subshell2.0
+${PACKAGE}FILES+=		subshell3.0
+${PACKAGE}FILES+=		subshell4.0
+${PACKAGE}FILES+=		unknown1.0
+${PACKAGE}FILES+=		var-assign1.0
 
 .include <bsd.test.mk>
diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile
index 351babd..1726ff0 100644
--- a/bin/sh/tests/expansion/Makefile
+++ b/bin/sh/tests/expansion/Makefile
@@ -1,98 +1,95 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		arith1.0
-FILES+=		arith2.0
-FILES+=		arith3.0
-FILES+=		arith4.0
-FILES+=		arith5.0
-FILES+=		arith6.0
-FILES+=		arith7.0
-FILES+=		arith8.0
-FILES+=		arith9.0
-FILES+=		arith10.0
-FILES+=		arith11.0
-FILES+=		arith12.0
-FILES+=		arith13.0
-FILES+=		arith14.0
-FILES+=		assign1.0
-FILES+=		cmdsubst1.0
-FILES+=		cmdsubst2.0
-FILES+=		cmdsubst3.0
-FILES+=		cmdsubst4.0
-FILES+=		cmdsubst5.0
-FILES+=		cmdsubst6.0
-FILES+=		cmdsubst7.0
-FILES+=		cmdsubst8.0
-FILES+=		cmdsubst9.0
-FILES+=		cmdsubst10.0
-FILES+=		cmdsubst11.0
-FILES+=		cmdsubst12.0
-FILES+=		cmdsubst13.0
-FILES+=		cmdsubst14.0
-FILES+=		cmdsubst15.0
-FILES+=		cmdsubst16.0
-FILES+=		cmdsubst17.0
-FILES+=		export1.0
-FILES+=		export2.0
-FILES+=		export3.0
-FILES+=		heredoc1.0
-FILES+=		heredoc2.0
-FILES+=		ifs1.0
-FILES+=		ifs2.0
-FILES+=		ifs3.0
-FILES+=		ifs4.0
-FILES+=		ifs5.0
-FILES+=		ifs6.0
-FILES+=		ifs7.0
-FILES+=		length1.0
-FILES+=		length2.0
-FILES+=		length3.0
-FILES+=		length4.0
-FILES+=		length5.0
-FILES+=		length6.0
-FILES+=		length7.0
-FILES+=		length8.0
-FILES+=		local1.0
-FILES+=		local2.0
-FILES+=		pathname1.0
-FILES+=		pathname2.0
-FILES+=		pathname3.0
-FILES+=		pathname4.0
-FILES+=		pathname5.0
-FILES+=		plus-minus1.0
-FILES+=		plus-minus2.0
-FILES+=		plus-minus3.0
-FILES+=		plus-minus4.0
-FILES+=		plus-minus5.0
-FILES+=		plus-minus6.0
-FILES+=		plus-minus7.0
-FILES+=		plus-minus8.0
-FILES+=		question1.0
-FILES+=		readonly1.0
-FILES+=		redir1.0
-FILES+=		set-u1.0
-FILES+=		set-u2.0
-FILES+=		set-u3.0
-FILES+=		tilde1.0
-FILES+=		tilde2.0
-FILES+=		trim1.0
-FILES+=		trim2.0
-FILES+=		trim3.0
-FILES+=		trim4.0
-FILES+=		trim5.0
-FILES+=		trim6.0
-FILES+=		trim7.0
-FILES+=		trim8.0
-FILES+=		trim9.0
+${PACKAGE}FILES+=	arith1.0
+${PACKAGE}FILES+=	arith2.0
+${PACKAGE}FILES+=	arith3.0
+${PACKAGE}FILES+=	arith4.0
+${PACKAGE}FILES+=	arith5.0
+${PACKAGE}FILES+=	arith6.0
+${PACKAGE}FILES+=	arith7.0
+${PACKAGE}FILES+=	arith8.0
+${PACKAGE}FILES+=	arith9.0
+${PACKAGE}FILES+=	arith10.0
+${PACKAGE}FILES+=	arith11.0
+${PACKAGE}FILES+=	arith12.0
+${PACKAGE}FILES+=	arith13.0
+${PACKAGE}FILES+=	arith14.0
+${PACKAGE}FILES+=	assign1.0
+${PACKAGE}FILES+=	cmdsubst1.0
+${PACKAGE}FILES+=	cmdsubst2.0
+${PACKAGE}FILES+=	cmdsubst3.0
+${PACKAGE}FILES+=	cmdsubst4.0
+${PACKAGE}FILES+=	cmdsubst5.0
+${PACKAGE}FILES+=	cmdsubst6.0
+${PACKAGE}FILES+=	cmdsubst7.0
+${PACKAGE}FILES+=	cmdsubst8.0
+${PACKAGE}FILES+=	cmdsubst9.0
+${PACKAGE}FILES+=	cmdsubst10.0
+${PACKAGE}FILES+=	cmdsubst11.0
+${PACKAGE}FILES+=	cmdsubst12.0
+${PACKAGE}FILES+=	cmdsubst13.0
+${PACKAGE}FILES+=	cmdsubst14.0
+${PACKAGE}FILES+=	cmdsubst15.0
+${PACKAGE}FILES+=	cmdsubst16.0
+${PACKAGE}FILES+=	cmdsubst17.0
+${PACKAGE}FILES+=	export1.0
+${PACKAGE}FILES+=	export2.0
+${PACKAGE}FILES+=	export3.0
+${PACKAGE}FILES+=	heredoc1.0
+${PACKAGE}FILES+=	heredoc2.0
+${PACKAGE}FILES+=	ifs1.0
+${PACKAGE}FILES+=	ifs2.0
+${PACKAGE}FILES+=	ifs3.0
+${PACKAGE}FILES+=	ifs4.0
+${PACKAGE}FILES+=	ifs5.0
+${PACKAGE}FILES+=	ifs6.0
+${PACKAGE}FILES+=	ifs7.0
+${PACKAGE}FILES+=	length1.0
+${PACKAGE}FILES+=	length2.0
+${PACKAGE}FILES+=	length3.0
+${PACKAGE}FILES+=	length4.0
+${PACKAGE}FILES+=	length5.0
+${PACKAGE}FILES+=	length6.0
+${PACKAGE}FILES+=	length7.0
+${PACKAGE}FILES+=	length8.0
+${PACKAGE}FILES+=	local1.0
+${PACKAGE}FILES+=	local2.0
+${PACKAGE}FILES+=	pathname1.0
+${PACKAGE}FILES+=	pathname2.0
+${PACKAGE}FILES+=	pathname3.0
+${PACKAGE}FILES+=	pathname4.0
+${PACKAGE}FILES+=	pathname5.0
+${PACKAGE}FILES+=	plus-minus1.0
+${PACKAGE}FILES+=	plus-minus2.0
+${PACKAGE}FILES+=	plus-minus3.0
+${PACKAGE}FILES+=	plus-minus4.0
+${PACKAGE}FILES+=	plus-minus5.0
+${PACKAGE}FILES+=	plus-minus6.0
+${PACKAGE}FILES+=	plus-minus7.0
+${PACKAGE}FILES+=	plus-minus8.0
+${PACKAGE}FILES+=	question1.0
+${PACKAGE}FILES+=	readonly1.0
+${PACKAGE}FILES+=	redir1.0
+${PACKAGE}FILES+=	set-u1.0
+${PACKAGE}FILES+=	set-u2.0
+${PACKAGE}FILES+=	set-u3.0
+${PACKAGE}FILES+=	tilde1.0
+${PACKAGE}FILES+=	tilde2.0
+${PACKAGE}FILES+=	trim1.0
+${PACKAGE}FILES+=	trim2.0
+${PACKAGE}FILES+=	trim3.0
+${PACKAGE}FILES+=	trim4.0
+${PACKAGE}FILES+=	trim5.0
+${PACKAGE}FILES+=	trim6.0
+${PACKAGE}FILES+=	trim7.0
+${PACKAGE}FILES+=	trim8.0
+${PACKAGE}FILES+=	trim9.0
 
 .include <bsd.test.mk>
diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile
index d510779..28c503a 100644
--- a/bin/sh/tests/parameters/Makefile
+++ b/bin/sh/tests/parameters/Makefile
@@ -1,31 +1,28 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		env1.0
-FILES+=		exitstatus1.0
-FILES+=		mail1.0
-FILES+=		mail2.0
-FILES+=		optind1.0
-FILES+=		optind2.0
-FILES+=		positional1.0
-FILES+=		positional2.0
-FILES+=		positional3.0
-FILES+=		positional4.0
-FILES+=		positional5.0
-FILES+=		positional6.0
-FILES+=		positional7.0
-FILES+=		positional8.0
-FILES+=		positional9.0
-FILES+=		pwd1.0
-FILES+=		pwd2.0
+${PACKAGE}FILES+=	env1.0
+${PACKAGE}FILES+=	exitstatus1.0
+${PACKAGE}FILES+=	mail1.0
+${PACKAGE}FILES+=	mail2.0
+${PACKAGE}FILES+=	optind1.0
+${PACKAGE}FILES+=	optind2.0
+${PACKAGE}FILES+=	positional1.0
+${PACKAGE}FILES+=	positional2.0
+${PACKAGE}FILES+=	positional3.0
+${PACKAGE}FILES+=	positional4.0
+${PACKAGE}FILES+=	positional5.0
+${PACKAGE}FILES+=	positional6.0
+${PACKAGE}FILES+=	positional7.0
+${PACKAGE}FILES+=	positional8.0
+${PACKAGE}FILES+=	positional9.0
+${PACKAGE}FILES+=	pwd1.0
+${PACKAGE}FILES+=	pwd2.0
 
 .include <bsd.test.mk>
diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile
index 4f823b0..b5ac566 100644
--- a/bin/sh/tests/parser/Makefile
+++ b/bin/sh/tests/parser/Makefile
@@ -1,88 +1,85 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		alias1.0
-FILES+=		alias2.0
-FILES+=		alias3.0
-FILES+=		alias4.0
-FILES+=		alias5.0
-FILES+=		alias6.0
-FILES+=		alias7.0
-FILES+=		alias8.0
-FILES+=		alias9.0
-FILES+=		alias10.0
-FILES+=		alias11.0
-FILES+=		alias12.0
-FILES+=		alias13.0
-FILES+=		alias14.0
-FILES+=		alias15.0 alias15.0.stdout
-FILES+=		and-pipe-not.0
-FILES+=		case1.0
-FILES+=		case2.0
-FILES+=		comment1.0
-FILES+=		comment2.42
-FILES+=		dollar-quote1.0
-FILES+=		dollar-quote2.0
-FILES+=		dollar-quote3.0
-FILES+=		dollar-quote4.0
-FILES+=		dollar-quote5.0
-FILES+=		dollar-quote6.0
-FILES+=		dollar-quote7.0
-FILES+=		dollar-quote8.0
-FILES+=		dollar-quote9.0
-FILES+=		dollar-quote10.0
-FILES+=		dollar-quote11.0
-FILES+=		dollar-quote12.0
-FILES+=		dollar-quote13.0
-FILES+=		empty-braces1.0
-FILES+=		empty-cmd1.0
-FILES+=		for1.0
-FILES+=		for2.0
-FILES+=		func1.0
-FILES+=		func2.0
-FILES+=		func3.0
-FILES+=		heredoc1.0
-FILES+=		heredoc2.0
-FILES+=		heredoc3.0
-FILES+=		heredoc4.0
-FILES+=		heredoc5.0
-FILES+=		heredoc6.0
-FILES+=		heredoc7.0
-FILES+=		heredoc8.0
-FILES+=		heredoc9.0
-FILES+=		heredoc10.0
-FILES+=		heredoc11.0
-FILES+=		heredoc12.0
-FILES+=		heredoc13.0
-FILES+=		line-cont1.0
-FILES+=		line-cont2.0
-FILES+=		line-cont3.0
-FILES+=		line-cont4.0
-FILES+=		line-cont5.0
-FILES+=		line-cont6.0
-FILES+=		line-cont7.0
-FILES+=		line-cont8.0
-FILES+=		line-cont9.0
-FILES+=		line-cont10.0
-FILES+=		line-cont11.0
-FILES+=		no-space1.0
-FILES+=		no-space2.0
-FILES+=		nul1.0
-FILES+=		only-redir1.0
-FILES+=		only-redir2.0
-FILES+=		only-redir3.0
-FILES+=		only-redir4.0
-FILES+=		pipe-not1.0
-FILES+=		set-v1.0 set-v1.0.stderr
-FILES+=		var-assign1.0
+${PACKAGE}FILES+=	alias1.0
+${PACKAGE}FILES+=	alias2.0
+${PACKAGE}FILES+=	alias3.0
+${PACKAGE}FILES+=	alias4.0
+${PACKAGE}FILES+=	alias5.0
+${PACKAGE}FILES+=	alias6.0
+${PACKAGE}FILES+=	alias7.0
+${PACKAGE}FILES+=	alias8.0
+${PACKAGE}FILES+=	alias9.0
+${PACKAGE}FILES+=	alias10.0
+${PACKAGE}FILES+=	alias11.0
+${PACKAGE}FILES+=	alias12.0
+${PACKAGE}FILES+=	alias13.0
+${PACKAGE}FILES+=	alias14.0
+${PACKAGE}FILES+=	alias15.0 alias15.0.stdout
+${PACKAGE}FILES+=	and-pipe-not.0
+${PACKAGE}FILES+=	case1.0
+${PACKAGE}FILES+=	case2.0
+${PACKAGE}FILES+=	comment1.0
+${PACKAGE}FILES+=	comment2.42
+${PACKAGE}FILES+=	dollar-quote1.0
+${PACKAGE}FILES+=	dollar-quote2.0
+${PACKAGE}FILES+=	dollar-quote3.0
+${PACKAGE}FILES+=	dollar-quote4.0
+${PACKAGE}FILES+=	dollar-quote5.0
+${PACKAGE}FILES+=	dollar-quote6.0
+${PACKAGE}FILES+=	dollar-quote7.0
+${PACKAGE}FILES+=	dollar-quote8.0
+${PACKAGE}FILES+=	dollar-quote9.0
+${PACKAGE}FILES+=	dollar-quote10.0
+${PACKAGE}FILES+=	dollar-quote11.0
+${PACKAGE}FILES+=	dollar-quote12.0
+${PACKAGE}FILES+=	dollar-quote13.0
+${PACKAGE}FILES+=	empty-braces1.0
+${PACKAGE}FILES+=	empty-cmd1.0
+${PACKAGE}FILES+=	for1.0
+${PACKAGE}FILES+=	for2.0
+${PACKAGE}FILES+=	func1.0
+${PACKAGE}FILES+=	func2.0
+${PACKAGE}FILES+=	func3.0
+${PACKAGE}FILES+=	heredoc1.0
+${PACKAGE}FILES+=	heredoc2.0
+${PACKAGE}FILES+=	heredoc3.0
+${PACKAGE}FILES+=	heredoc4.0
+${PACKAGE}FILES+=	heredoc5.0
+${PACKAGE}FILES+=	heredoc6.0
+${PACKAGE}FILES+=	heredoc7.0
+${PACKAGE}FILES+=	heredoc8.0
+${PACKAGE}FILES+=	heredoc9.0
+${PACKAGE}FILES+=	heredoc10.0
+${PACKAGE}FILES+=	heredoc11.0
+${PACKAGE}FILES+=	heredoc12.0
+${PACKAGE}FILES+=	heredoc13.0
+${PACKAGE}FILES+=	line-cont1.0
+${PACKAGE}FILES+=	line-cont2.0
+${PACKAGE}FILES+=	line-cont3.0
+${PACKAGE}FILES+=	line-cont4.0
+${PACKAGE}FILES+=	line-cont5.0
+${PACKAGE}FILES+=	line-cont6.0
+${PACKAGE}FILES+=	line-cont7.0
+${PACKAGE}FILES+=	line-cont8.0
+${PACKAGE}FILES+=	line-cont9.0
+${PACKAGE}FILES+=	line-cont10.0
+${PACKAGE}FILES+=	line-cont11.0
+${PACKAGE}FILES+=	no-space1.0
+${PACKAGE}FILES+=	no-space2.0
+${PACKAGE}FILES+=	nul1.0
+${PACKAGE}FILES+=	only-redir1.0
+${PACKAGE}FILES+=	only-redir2.0
+${PACKAGE}FILES+=	only-redir3.0
+${PACKAGE}FILES+=	only-redir4.0
+${PACKAGE}FILES+=	pipe-not1.0
+${PACKAGE}FILES+=	set-v1.0 set-v1.0.stderr
+${PACKAGE}FILES+=	var-assign1.0
 
 .include <bsd.test.mk>
diff --git a/bin/sh/tests/set-e/Makefile b/bin/sh/tests/set-e/Makefile
index 3d7481d..211fc95 100644
--- a/bin/sh/tests/set-e/Makefile
+++ b/bin/sh/tests/set-e/Makefile
@@ -1,49 +1,46 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}
 ATF_TESTS_SH=	functional_test
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		and1.0
-FILES+=		and2.1
-FILES+=		and3.0
-FILES+=		and4.0
-FILES+=		background1.0
-FILES+=		cmd1.0
-FILES+=		cmd2.1
-FILES+=		elif1.0
-FILES+=		elif2.0
-FILES+=		eval1.0
-FILES+=		eval2.1
-FILES+=		for1.0
-FILES+=		func1.0
-FILES+=		func2.1
-FILES+=		if1.0
-FILES+=		if2.0
-FILES+=		if3.0
-FILES+=		not1.0
-FILES+=		not2.0
-FILES+=		or1.0
-FILES+=		or2.0
-FILES+=		or3.1
-FILES+=		pipe1.1
-FILES+=		pipe2.0
-FILES+=		return1.0
-FILES+=		semi1.1
-FILES+=		semi2.1
-FILES+=		subshell1.0
-FILES+=		subshell2.1
-FILES+=		until1.0
-FILES+=		until2.0
-FILES+=		until3.0
-FILES+=		while1.0
-FILES+=		while2.0
-FILES+=		while3.0
+${PACKAGE}FILES+=	and1.0
+${PACKAGE}FILES+=	and2.1
+${PACKAGE}FILES+=	and3.0
+${PACKAGE}FILES+=	and4.0
+${PACKAGE}FILES+=	background1.0
+${PACKAGE}FILES+=	cmd1.0
+${PACKAGE}FILES+=	cmd2.1
+${PACKAGE}FILES+=	elif1.0
+${PACKAGE}FILES+=	elif2.0
+${PACKAGE}FILES+=	eval1.0
+${PACKAGE}FILES+=	eval2.1
+${PACKAGE}FILES+=	for1.0
+${PACKAGE}FILES+=	func1.0
+${PACKAGE}FILES+=	func2.1
+${PACKAGE}FILES+=	if1.0
+${PACKAGE}FILES+=	if2.0
+${PACKAGE}FILES+=	if3.0
+${PACKAGE}FILES+=	not1.0
+${PACKAGE}FILES+=	not2.0
+${PACKAGE}FILES+=	or1.0
+${PACKAGE}FILES+=	or2.0
+${PACKAGE}FILES+=	or3.1
+${PACKAGE}FILES+=	pipe1.1
+${PACKAGE}FILES+=	pipe2.0
+${PACKAGE}FILES+=	return1.0
+${PACKAGE}FILES+=	semi1.1
+${PACKAGE}FILES+=	semi2.1
+${PACKAGE}FILES+=	subshell1.0
+${PACKAGE}FILES+=	subshell2.1
+${PACKAGE}FILES+=	until1.0
+${PACKAGE}FILES+=	until2.0
+${PACKAGE}FILES+=	until3.0
+${PACKAGE}FILES+=	while1.0
+${PACKAGE}FILES+=	while2.0
+${PACKAGE}FILES+=	while3.0
 
 .include <bsd.test.mk>
diff --git a/bin/sleep/tests/Makefile b/bin/sleep/tests/Makefile
index 615d80a..6fc95f3 100644
--- a/bin/sleep/tests/Makefile
+++ b/bin/sleep/tests/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 NETBSD_ATF_TESTS_SH=	sleep_test
 
 .include <bsd.test.mk>
diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile
index aff93d8..a1a5d4f 100644
--- a/bin/test/tests/Makefile
+++ b/bin/test/tests/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 TAP_TESTS_SH=	legacy_test
 # Some tests in here are silently not run when the tests are executed as
 # root.  Explicitly tell Kyua to drop privileges.
diff --git a/bin/tests/Makefile b/bin/tests/Makefile
index 06058a0..3b3078f 100644
--- a/bin/tests/Makefile
+++ b/bin/tests/Makefile
@@ -1,13 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
-FILESGROUPS=	FILES
-PACKAGE=	tests
-FILESGROUPS+=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-TESTS+=		Kyuafile
-
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes