More 'tests' package fixes.

Sponsored by:	The FreeBSD Foundation

67 files changed, 204 insertions, 0 deletions

diff --git a/lib/libc/tests/gen/execve/Makefile b/lib/libc/tests/gen/execve/Makefile
index 5e8bc6f..a9800db 100644
--- a/lib/libc/tests/gen/execve/Makefile
+++ b/lib/libc/tests/gen/execve/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	execve_test
 
 .include "../../Makefile.netbsd-tests"
diff --git a/tests/etc/Makefile b/tests/etc/Makefile
index 1e49666..7e73a48 100644
--- a/tests/etc/Makefile
+++ b/tests/etc/Makefile
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+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 368e8f4..3b946a3 100644
--- a/tests/etc/rc.d/Makefile
+++ b/tests/etc/rc.d/Makefile
@@ -1,5 +1,8 @@
 # $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 18a24a4..034dfd3 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -2,6 +2,9 @@
 
 .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 298b0a2..b85cf00 100644
--- a/tests/sys/acl/Makefile
+++ b/tests/sys/acl/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/acl
 
 BINDIR=		${TESTSDIR}
diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile
index 766d9b0..0003b84 100644
--- a/tests/sys/aio/Makefile
+++ b/tests/sys/aio/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/aio
 
 PLAIN_TESTS_C+=	aio_kqueue_test
diff --git a/tests/sys/fifo/Makefile b/tests/sys/fifo/Makefile
index 602bf1e..750d5db 100644
--- a/tests/sys/fifo/Makefile
+++ b/tests/sys/fifo/Makefile
@@ -1,5 +1,8 @@
 # $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 ed2d2c4..0b3c0fc 100644
--- a/tests/sys/file/Makefile
+++ b/tests/sys/file/Makefile
@@ -1,5 +1,8 @@
 # $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 bf8604d..e6ecc83 100644
--- a/tests/sys/geom/Makefile
+++ b/tests/sys/geom/Makefile
@@ -1,5 +1,8 @@
 # $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 c705616..d4f6168 100644
--- a/tests/sys/geom/class/Makefile
+++ b/tests/sys/geom/class/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class
 
 TESTS_SUBDIRS+=	concat
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index c9a7cfd..f38cc58 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/kernel
 
 TESTSDIR=	${TESTSBASE}/sys/kern
diff --git a/tests/sys/kern/acct/Makefile b/tests/sys/kern/acct/Makefile
index ca3df4c..3a9a7ec 100644
--- a/tests/sys/kern/acct/Makefile
+++ b/tests/sys/kern/acct/Makefile
@@ -1,5 +1,8 @@
 # $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 82c5d4b..a029b8f 100644
--- a/tests/sys/kern/execve/Makefile
+++ b/tests/sys/kern/execve/Makefile
@@ -1,5 +1,8 @@
 # $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 bcd2d07..bcc61b4 100644
--- a/tests/sys/kern/pipe/Makefile
+++ b/tests/sys/kern/pipe/Makefile
@@ -1,5 +1,8 @@
 # $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 43277ca..2ec462a 100644
--- a/tests/sys/kqueue/Makefile
+++ b/tests/sys/kqueue/Makefile
@@ -6,6 +6,9 @@
 # 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 ae2c491..db91895 100644
--- a/tests/sys/mac/Makefile
+++ b/tests/sys/mac/Makefile
@@ -1,5 +1,8 @@
 # $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 9d0b6f6..8fdee52 100644
--- a/tests/sys/mac/bsdextended/Makefile
+++ b/tests/sys/mac/bsdextended/Makefile
@@ -1,5 +1,8 @@
 # $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 129d486..b894c8c 100644
--- a/tests/sys/mac/portacl/Makefile
+++ b/tests/sys/mac/portacl/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/mac/portacl
 BINDIR=		${TESTSDIR}
 
diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile
index ce5033c..6ccd275 100644
--- a/tests/sys/mqueue/Makefile
+++ b/tests/sys/mqueue/Makefile
@@ -1,5 +1,8 @@
 # $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 3f65fb6..4fe2922 100644
--- a/tests/sys/netinet/Makefile
+++ b/tests/sys/netinet/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/netinet
 BINDIR=		${TESTSDIR}
 
diff --git a/tests/sys/opencrypto/Makefile b/tests/sys/opencrypto/Makefile
index 1696920..96cc86b 100644
--- a/tests/sys/opencrypto/Makefile
+++ b/tests/sys/opencrypto/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/opencrypto
 BINDIR=		${TESTSDIR}
 
diff --git a/tests/sys/pjdfstest/Makefile b/tests/sys/pjdfstest/Makefile
index a398d39..65f562a 100644
--- a/tests/sys/pjdfstest/Makefile
+++ b/tests/sys/pjdfstest/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 SUBDIR+=	pjdfstest
 SUBDIR+=	tests
 SUBDIR_PARALLEL=
diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile
index 29bee82..8ae74e7 100644
--- a/tests/sys/pjdfstest/pjdfstest/Makefile
+++ b/tests/sys/pjdfstest/pjdfstest/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TOP=		${.CURDIR:H:H:H:H}
 
 .PATH: ${TOP}/contrib/pjdfstest
diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile
index 61b15dd..d79c257 100644
--- a/tests/sys/pjdfstest/tests/Makefile
+++ b/tests/sys/pjdfstest/tests/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 PJDFSTEST_SRCDIR=	${SRCTOP}/contrib/pjdfstest
 
 TESTSDIR=	${TESTSBASE}/sys/pjdfstest
diff --git a/tests/sys/posixshm/Makefile b/tests/sys/posixshm/Makefile
index 2acdfa4..aab71d1 100644
--- a/tests/sys/posixshm/Makefile
+++ b/tests/sys/posixshm/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/posixshm
 
 ATF_TESTS_C+=	posixshm_test
diff --git a/tests/sys/vfs/Makefile b/tests/sys/vfs/Makefile
index 48f5226..09e4518 100644
--- a/tests/sys/vfs/Makefile
+++ b/tests/sys/vfs/Makefile
@@ -1,5 +1,8 @@
 # $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 08fbb21..9d1be8b 100644
--- a/tests/sys/vm/Makefile
+++ b/tests/sys/vm/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/vm
 
 ATF_TESTS_C+=	mmap_test
diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
index 15389c8..5ef093f 100644
--- a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
index 1d2f6e2..0b9db19 100644
--- a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
index 2a96124..b76bdc1 100644
--- a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile
index 1235659..d1ee84d 100644
--- a/usr.bin/bmake/tests/basic/t0/Makefile
+++ b/usr.bin/bmake/tests/basic/t0/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t0
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile
index 732dc65..3faeffa 100644
--- a/usr.bin/bmake/tests/basic/t1/Makefile
+++ b/usr.bin/bmake/tests/basic/t1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile
index 58c36ff..6d7b6b4 100644
--- a/usr.bin/bmake/tests/basic/t2/Makefile
+++ b/usr.bin/bmake/tests/basic/t2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t2
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile
index a173414..2b268e9 100644
--- a/usr.bin/bmake/tests/basic/t3/Makefile
+++ b/usr.bin/bmake/tests/basic/t3/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/basic/t3
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile
index 5629b4b..abc8b9e 100644
--- a/usr.bin/bmake/tests/execution/ellipsis/Makefile
+++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/ellipsis
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile
index 6421b96..2828140 100644
--- a/usr.bin/bmake/tests/execution/empty/Makefile
+++ b/usr.bin/bmake/tests/execution/empty/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/empty
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile
index d183eb1..7056afd 100644
--- a/usr.bin/bmake/tests/execution/joberr/Makefile
+++ b/usr.bin/bmake/tests/execution/joberr/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/joberr
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile
index 8b489d5..c5e42bd 100644
--- a/usr.bin/bmake/tests/execution/plus/Makefile
+++ b/usr.bin/bmake/tests/execution/plus/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/execution/plus
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile
index cd458a9..713e825 100644
--- a/usr.bin/bmake/tests/shell/builtin/Makefile
+++ b/usr.bin/bmake/tests/shell/builtin/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/builtin
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile
index b342e79..4b14289 100644
--- a/usr.bin/bmake/tests/shell/meta/Makefile
+++ b/usr.bin/bmake/tests/shell/meta/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/meta
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile
index 5a83a1f..8b1ce86 100644
--- a/usr.bin/bmake/tests/shell/path/Makefile
+++ b/usr.bin/bmake/tests/shell/path/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile
index 1819f91..acc6339 100644
--- a/usr.bin/bmake/tests/shell/path_select/Makefile
+++ b/usr.bin/bmake/tests/shell/path_select/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/path_select
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile
index 0dae915..b0f21ab 100644
--- a/usr.bin/bmake/tests/shell/replace/Makefile
+++ b/usr.bin/bmake/tests/shell/replace/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/replace
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile
index 45e6d72..e627010 100644
--- a/usr.bin/bmake/tests/shell/select/Makefile
+++ b/usr.bin/bmake/tests/shell/select/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/shell/select
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile
index 9ae720e..d917de0 100644
--- a/usr.bin/bmake/tests/suffixes/basic/Makefile
+++ b/usr.bin/bmake/tests/suffixes/basic/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/basic
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
index 00be930..621ec60 100644
--- a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
index 34aad07..a1c6535 100644
--- a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
index 66e1f32..e790b94 100644
--- a/usr.bin/bmake/tests/syntax/directive-t0/Makefile
+++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/directive-t0
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile
index 743e88f..0ba16a7 100644
--- a/usr.bin/bmake/tests/syntax/enl/Makefile
+++ b/usr.bin/bmake/tests/syntax/enl/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/enl
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
index 53a3e4d..3e56b2b 100644
--- a/usr.bin/bmake/tests/syntax/funny-targets/Makefile
+++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/funny-targets
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile
index 00a7f1e..cb57bbc 100644
--- a/usr.bin/bmake/tests/syntax/semi/Makefile
+++ b/usr.bin/bmake/tests/syntax/semi/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/syntax/semi
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
index 5578a9b..87e6827 100644
--- a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
index 2204807..2a6fc75 100644
--- a/usr.bin/bmake/tests/sysmk/t0/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile
index f38383c..d31d561 100644
--- a/usr.bin/bmake/tests/sysmk/t0/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
index be1bd5a..e7620a5 100644
--- a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk
 
 FILESDIR=		${TESTSDIR}
diff --git a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
index c5e2889..a66fb25 100644
--- a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
index 7c2e619..bf3991a 100644
--- a/usr.bin/bmake/tests/sysmk/t1/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile
index 4d32823..fac186f 100644
--- a/usr.bin/bmake/tests/sysmk/t1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
index ccfd1b6..dc46dd8 100644
--- a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk
 
 FILESDIR=		${TESTSDIR}
diff --git a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
index e06539a..5ce3194 100644
--- a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
index 7d1c68e..9b0526f 100644
--- a/usr.bin/bmake/tests/sysmk/t2/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/2
 
 TESTS_SUBDIRS=	1
diff --git a/usr.bin/bmake/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile
index 734c7d8..1c6bad0 100644
--- a/usr.bin/bmake/tests/sysmk/t2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2
 
 TESTS_SUBDIRS=	2
diff --git a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
index 29460dc..7aec656 100644
--- a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk
 
 FILESDIR=		${TESTSDIR}
diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile
index 2490382..5841047 100644
--- a/usr.bin/bmake/tests/variables/modifier_M/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_M
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile
index d108da4..b35881a 100644
--- a/usr.bin/bmake/tests/variables/modifier_t/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/modifier_t
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile
index 94a6aff..f52507f 100644
--- a/usr.bin/bmake/tests/variables/opt_V/Makefile
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/opt_V
 
 TAP_TESTS_SH=	legacy_test
diff --git a/usr.bin/bmake/tests/variables/t0/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile
index c4b98e6..4b845d7 100644
--- a/usr.bin/bmake/tests/variables/t0/Makefile
+++ b/usr.bin/bmake/tests/variables/t0/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/usr.bin/bmake/variables/t0
 
 TAP_TESTS_SH=	legacy_test