42 files changed, 160 insertions, 0 deletions

diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
index a069bb19d1e60..bebc7efc81750 100644
--- a/lib/atf/libatf-c++/tests/Makefile
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TESTS_SUBDIRS=	detail
 
 ATF=		${SRCTOP}/contrib/atf
diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile
index f7d672e792fbc..4c5e1be953d8f 100644
--- a/lib/atf/libatf-c++/tests/detail/Makefile
+++ b/lib/atf/libatf-c++/tests/detail/Makefile
@@ -2,6 +2,7 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail
 
 ATF=		${SRCTOP}/contrib/atf
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
index e864c2e8bafce..82d6db427110a 100644
--- a/lib/atf/libatf-c/tests/Makefile
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TESTS_SUBDIRS=	detail
 
 ATF=		${SRCTOP}/contrib/atf
diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile
index dc79bb3491f5d..ee998049e8458 100644
--- a/lib/atf/tests/Makefile
+++ b/lib/atf/tests/Makefile
@@ -2,7 +2,12 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf
+TESTS+=		Kyuafile
+
 
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile
index aa308268a0437..24f7b799880fa 100644
--- a/lib/atf/tests/test-programs/Makefile
+++ b/lib/atf/tests/test-programs/Makefile
@@ -2,7 +2,11 @@
 
 .include <bsd.init.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf/test-programs
+TESTS+=		Kyuafile
 KYUAFILE=	yes
 
 ATF=		${SRCTOP}/contrib/atf
diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile
index 73ded3dc55564..160ebb4f9499d 100644
--- a/lib/libarchive/tests/Makefile
+++ b/lib/libarchive/tests/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 
 ATF_TESTS_SH+=	functional_test
diff --git a/lib/libc/tests/Makefile b/lib/libc/tests/Makefile
index a9d8c02bbb5da..b459d6d7b2e35 100644
--- a/lib/libc/tests/Makefile
+++ b/lib/libc/tests/Makefile
@@ -2,6 +2,10 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 SUBDIR=		tls_dso
 
 TESTS_SUBDIRS=	c063
diff --git a/lib/libc/tests/c063/Makefile b/lib/libc/tests/c063/Makefile
index 05da6ea212a99..7790628812492 100644
--- a/lib/libc/tests/c063/Makefile
+++ b/lib/libc/tests/c063/Makefile
@@ -2,6 +2,10 @@
 
 #TODO: t_o_search
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	faccessat_test
 NETBSD_ATF_TESTS_C+=	fchmodat_test
 NETBSD_ATF_TESTS_C+=	fchownat_test
diff --git a/lib/libc/tests/db/Makefile b/lib/libc/tests/db/Makefile
index eb0ce395e28af..ffe90d0b7a77f 100644
--- a/lib/libc/tests/db/Makefile
+++ b/lib/libc/tests/db/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 BINDIR=		${TESTSDIR}
 
 PROGS=		h_db
diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile
index b700312d8128c..b2cef62dd8f39 100644
--- a/lib/libc/tests/gen/Makefile
+++ b/lib/libc/tests/gen/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		arc4random_test
 ATF_TESTS_C+=		fmtcheck2_test
 ATF_TESTS_C+=		fmtmsg_test
diff --git a/lib/libc/tests/hash/Makefile b/lib/libc/tests/hash/Makefile
index 6facb5a1bdf02..188ba7f1400ed 100644
--- a/lib/libc/tests/hash/Makefile
+++ b/lib/libc/tests/hash/Makefile
@@ -2,6 +2,10 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=
 
 .if ${MK_OPENSSL} != "no"
diff --git a/lib/libc/tests/inet/Makefile b/lib/libc/tests/inet/Makefile
index ee6f98e2f71f7..f06150834cb24 100644
--- a/lib/libc/tests/inet/Makefile
+++ b/lib/libc/tests/inet/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	inet_network_test
 
 .include "../Makefile.netbsd-tests"
diff --git a/lib/libc/tests/locale/Makefile b/lib/libc/tests/locale/Makefile
index e05cbae3ac9f8..5a5954ac7db9a 100644
--- a/lib/libc/tests/locale/Makefile
+++ b/lib/libc/tests/locale/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		btowc_test
 ATF_TESTS_C+=		c16rtomb_test
 ATF_TESTS_C+=		iswctype_test
diff --git a/lib/libc/tests/net/Makefile b/lib/libc/tests/net/Makefile
index e126848f9727a..56710c150aa86 100644
--- a/lib/libc/tests/net/Makefile
+++ b/lib/libc/tests/net/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=	ether_test
 ATF_TESTS_C+=	eui64_aton_test
 ATF_TESTS_C+=	eui64_ntoa_test
diff --git a/lib/libc/tests/nss/Makefile b/lib/libc/tests/nss/Makefile
index 1b777c2b26d3e..da676a732e9e9 100644
--- a/lib/libc/tests/nss/Makefile
+++ b/lib/libc/tests/nss/Makefile
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/libc/nss
+
 BINDIR=		${TESTSDIR}
 
 .PATH: ${.CURDIR:H}/resolv
diff --git a/lib/libc/tests/regex/Makefile b/lib/libc/tests/regex/Makefile
index 946bc445846b9..f60d512dc09b0 100644
--- a/lib/libc/tests/regex/Makefile
+++ b/lib/libc/tests/regex/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 BINDIR=		${TESTSDIR}
 
 IMPLEMENTATION?=      -DREGEX_SPENCER
diff --git a/lib/libc/tests/resolv/Makefile b/lib/libc/tests/resolv/Makefile
index 4fb43d8955ed5..cc17ef59afac2 100644
--- a/lib/libc/tests/resolv/Makefile
+++ b/lib/libc/tests/resolv/Makefile
@@ -1,6 +1,10 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/libc/resolv
+
 BINDIR=		${TESTSDIR}
 
 FILES+=		mach
diff --git a/lib/libc/tests/rpc/Makefile b/lib/libc/tests/rpc/Makefile
index d7780ef4b86ce..6a6ae7b1c639f 100644
--- a/lib/libc/tests/rpc/Makefile
+++ b/lib/libc/tests/rpc/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 SRCS.xdr_test=		${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} \
 			h_testbits.h
 
diff --git a/lib/libc/tests/setjmp/Makefile b/lib/libc/tests/setjmp/Makefile
index 39b0a96295f43..b645b4d8eb077 100644
--- a/lib/libc/tests/setjmp/Makefile
+++ b/lib/libc/tests/setjmp/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	setjmp_test
 NETBSD_ATF_TESTS_C+=	threadjmp_test
 
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile
index 61cacedfb3a64..09adf97d5560e 100644
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NO_WERROR=
 WARNS?=	2
 
diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile
index 72685e078e723..50484fd54b449 100644
--- a/lib/libc/tests/stdio/Makefile
+++ b/lib/libc/tests/stdio/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		fdopen_test
 ATF_TESTS_C+=		fmemopen2_test
 ATF_TESTS_C+=		fopen2_test
diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile
index 87e84c5df51c3..08f34b0a0e28e 100644
--- a/lib/libc/tests/stdlib/Makefile
+++ b/lib/libc/tests/stdlib/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		heapsort_test
 ATF_TESTS_C+=		mergesort_test
 ATF_TESTS_C+=		qsort_test
diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile
index 9c677b772350d..b769529e00c7d 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=		stpncpy_test
 ATF_TESTS_C+=		strerror2_test
 ATF_TESTS_C+=		wcscasecmp_test
diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile
index efc892ceb6cce..69f5f656d584f 100644
--- a/lib/libc/tests/sys/Makefile
+++ b/lib/libc/tests/sys/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=			queue_test
 
 # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,
diff --git a/lib/libc/tests/termios/Makefile b/lib/libc/tests/termios/Makefile
index 0495d684b505a..81b0ff1d8ba6e 100644
--- a/lib/libc/tests/termios/Makefile
+++ b/lib/libc/tests/termios/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	tcsetpgrp_test
 
 .include "../Makefile.netbsd-tests"
diff --git a/lib/libc/tests/time/Makefile b/lib/libc/tests/time/Makefile
index feb543dad2433..49745e2331ecf 100644
--- a/lib/libc/tests/time/Makefile
+++ b/lib/libc/tests/time/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_C=	mktime_test
 NETBSD_ATF_TESTS_C+=	strptime_test
 
diff --git a/lib/libc/tests/tls/Makefile b/lib/libc/tests/tls/Makefile
index cbf441d6e1b14..0e98fed0ba18e 100644
--- a/lib/libc/tests/tls/Makefile
+++ b/lib/libc/tests/tls/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 .if !defined(NO_PIC)
 SUBDIR+=	dso
 .endif
diff --git a/lib/libc/tests/tls_dso/Makefile b/lib/libc/tests/tls_dso/Makefile
index 5449799de96c4..79b05f89e3c93 100644
--- a/lib/libc/tests/tls_dso/Makefile
+++ b/lib/libc/tests/tls_dso/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIB=		h_tls_dynamic
 SRCS=		h_tls_dynamic.c
 
diff --git a/lib/libc/tests/ttyio/Makefile b/lib/libc/tests/ttyio/Makefile
index d5b8f01685582..c9520fbdb318a 100644
--- a/lib/libc/tests/ttyio/Makefile
+++ b/lib/libc/tests/ttyio/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 # TODO: ptm_test
 NETBSD_ATF_TESTS_C=	ttyio_test
 
diff --git a/lib/libcrypt/tests/Makefile b/lib/libcrypt/tests/Makefile
index 15798b215d177..0c831ad6044a5 100644
--- a/lib/libcrypt/tests/Makefile
+++ b/lib/libcrypt/tests/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+= crypt_tests
 
 NETBSD_ATF_TESTS_C+= crypt_test
diff --git a/lib/libmp/tests/Makefile b/lib/libmp/tests/Makefile
index 42749d00a0392..86f0985da34ae 100644
--- a/lib/libmp/tests/Makefile
+++ b/lib/libmp/tests/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_C+=	legacy_test
 
 LIBADD+=	mp
diff --git a/lib/libnv/tests/Makefile b/lib/libnv/tests/Makefile
index cce0b5e8f1a76..d815af48b5cb0 100644
--- a/lib/libnv/tests/Makefile
+++ b/lib/libnv/tests/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_CXX=	\
 	dnv_tests \
 	nv_array_tests \
diff --git a/lib/libpam/libpam/tests/Makefile b/lib/libpam/libpam/tests/Makefile
index e40936a883db2..ec32229781e20 100644
--- a/lib/libpam/libpam/tests/Makefile
+++ b/lib/libpam/libpam/tests/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 OPENPAM=	${SRCTOP}/contrib/openpam
 .PATH: ${OPENPAM}/t
 
diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile
index c4a8471556630..f2427801ad398 100644
--- a/lib/libproc/tests/Makefile
+++ b/lib/libproc/tests/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_C+=	proc_test
 
 PROGS=		target_prog
diff --git a/lib/librt/tests/Makefile b/lib/librt/tests/Makefile
index c4817ecfad764..7f788aef98e5e 100644
--- a/lib/librt/tests/Makefile
+++ b/lib/librt/tests/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIBADD=	rt
 
 NETBSD_ATF_TESTS_C=	sched_test
diff --git a/lib/libthr/tests/Makefile b/lib/libthr/tests/Makefile
index aeb1ef89fb5b6..6c2139a5d5b3c 100644
--- a/lib/libthr/tests/Makefile
+++ b/lib/libthr/tests/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libpthread
 
 # TODO: t_name (missing pthread_getname_np support in FreeBSD)
diff --git a/lib/libthr/tests/dlopen/Makefile b/lib/libthr/tests/dlopen/Makefile
index bea70ec7cbd50..1f587a5af73b0 100644
--- a/lib/libthr/tests/dlopen/Makefile
+++ b/lib/libthr/tests/dlopen/Makefile
@@ -4,6 +4,9 @@ TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/libthr/dlopen
 
 CFLAGS+=	-DTESTDIR=\"${TESTSDIR:Q}/\"
diff --git a/lib/libutil/tests/Makefile b/lib/libutil/tests/Makefile
index 81b2a494eaaef..2f46850fd51ab 100644
--- a/lib/libutil/tests/Makefile
+++ b/lib/libutil/tests/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_C+=	flopen_test
 TAP_TESTS_C+=	grp_test
 TAP_TESTS_C+=	humanize_number_test
diff --git a/lib/libxo/tests/Makefile b/lib/libxo/tests/Makefile
index 1a0f7c69cfee0..43f2e9dfa1a51 100644
--- a/lib/libxo/tests/Makefile
+++ b/lib/libxo/tests/Makefile
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIBXOSRC=	${SRCTOP}/contrib/libxo
 
 # Override the default suffix transformation rules for .c/.o -> .out
diff --git a/lib/libxo/tests/encoder/Makefile b/lib/libxo/tests/encoder/Makefile
index 2fe42457f2e82..491af0cb1d9a3 100644
--- a/lib/libxo/tests/encoder/Makefile
+++ b/lib/libxo/tests/encoder/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 LIBXOSRC=	${SRCTOP}/contrib/libxo
 
 .PATH: ${LIBXOSRC}/encoder/test
diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile
index bbf0f01d7042d..b977db5a25ba0 100644
--- a/lib/msun/tests/Makefile
+++ b/lib/msun/tests/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libm
 
 # All architectures on FreeBSD have fenv.h
diff --git a/lib/tests/Makefile b/lib/tests/Makefile
index a0e63e5da42a4..ef5d72d4929d7 100644
--- a/lib/tests/Makefile
+++ b/lib/tests/Makefile
@@ -2,6 +2,7 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes