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

27 files changed, 65 insertions, 149 deletions

diff --git a/lib/libc/tests/Makefile b/lib/libc/tests/Makefile
index 8276422..ff1af55 100644
--- a/lib/libc/tests/Makefile
+++ b/lib/libc/tests/Makefile
@@ -2,10 +2,6 @@
 
 .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 7790628..05da6ea 100644
--- a/lib/libc/tests/c063/Makefile
+++ b/lib/libc/tests/c063/Makefile
@@ -2,10 +2,6 @@
 
 #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 ffe90d0..6c7ce96 100644
--- a/lib/libc/tests/db/Makefile
+++ b/lib/libc/tests/db/Makefile
@@ -1,16 +1,12 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 
 BINDIR=		${TESTSDIR}
 
 PROGS=		h_db
 
-FILESDIR=	${TESTSDIR}
-
-FILES=		README
+${PACKAGE}FILES+=		README
 
 NETBSD_ATF_TESTS_SH+=	db_test
 ATF_TESTS_SH_SED_db_test=	-e 's,/bin/csh,/bin/cat,g'
diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile
index b4e14d9..0830977 100644
--- a/lib/libc/tests/gen/Makefile
+++ b/lib/libc/tests/gen/Makefile
@@ -2,10 +2,6 @@
 
 .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/gen/execve/Makefile b/lib/libc/tests/gen/execve/Makefile
index a9800db..5e8bc6f 100644
--- a/lib/libc/tests/gen/execve/Makefile
+++ b/lib/libc/tests/gen/execve/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 NETBSD_ATF_TESTS_C=	execve_test
 
 .include "../../Makefile.netbsd-tests"
diff --git a/lib/libc/tests/gen/posix_spawn/Makefile b/lib/libc/tests/gen/posix_spawn/Makefile
index 659f73b..9b687c6 100644
--- a/lib/libc/tests/gen/posix_spawn/Makefile
+++ b/lib/libc/tests/gen/posix_spawn/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 BINDIR=		${TESTSDIR}
 
 NETBSD_ATF_TESTS_C=	fileactions_test
diff --git a/lib/libc/tests/hash/Makefile b/lib/libc/tests/hash/Makefile
index 188ba7f..313dff3 100644
--- a/lib/libc/tests/hash/Makefile
+++ b/lib/libc/tests/hash/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
+.include <src.opts.mk>
 
 NETBSD_ATF_TESTS_C=
 
@@ -18,13 +16,16 @@ BINDIR=		${TESTSDIR}
 
 PROGS+=		h_hash
 
-FILESDIR=	${TESTSDIR}/data
+FILESGROUPS+=	${PACKAGE}DATA_FILES
+${PACKAGE}DATA_FILESPACKAGE=	tests
+
+${PACKAGE}DATA_FILESDIR=	${TESTSDIR}/data
 
-FILES+=		data/md5test-in
-FILES+=		data/md5test-out
-FILES+=		data/sha1test-in
-FILES+=		data/sha1test-out
-FILES+=		data/sha1test2-out
+${PACKAGE}DATA_FILES+=	data/md5test-in
+${PACKAGE}DATA_FILES+=	data/md5test-out
+${PACKAGE}DATA_FILES+=	data/sha1test-in
+${PACKAGE}DATA_FILES+=	data/sha1test-out
+${PACKAGE}DATA_FILES+=	data/sha1test2-out
 
 LIBADD+=		md
 LIBADD.sha2_test+=	crypto
diff --git a/lib/libc/tests/inet/Makefile b/lib/libc/tests/inet/Makefile
index f061508..ee6f98e 100644
--- a/lib/libc/tests/inet/Makefile
+++ b/lib/libc/tests/inet/Makefile
@@ -2,10 +2,6 @@
 
 .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 5a5954a..e05cbae 100644
--- a/lib/libc/tests/locale/Makefile
+++ b/lib/libc/tests/locale/Makefile
@@ -2,10 +2,6 @@
 
 .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 56710c1..23def7e 100644
--- a/lib/libc/tests/net/Makefile
+++ b/lib/libc/tests/net/Makefile
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 
 ATF_TESTS_C+=	ether_test
 ATF_TESTS_C+=	eui64_aton_test
@@ -37,7 +35,7 @@ aton_ether_subr.c: gen_ether_subr ${SRCTOP}/sys/net/if_ethersubr.c
 
 # TODO: the testcases needs to be ported to FreeBSD
 #TESTS_SUBDIRS=	getaddrinfo
-FILES+=	hosts
-FILES+=	resolv.conf
+${PACKAGE}FILES+=	hosts
+${PACKAGE}FILES+=	resolv.conf
 
 .include <bsd.test.mk>
diff --git a/lib/libc/tests/net/getaddrinfo/Makefile b/lib/libc/tests/net/getaddrinfo/Makefile
index d21d336..96b60d2 100644
--- a/lib/libc/tests/net/getaddrinfo/Makefile
+++ b/lib/libc/tests/net/getaddrinfo/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T}
 
 .include <bsd.own.mk>
@@ -12,15 +14,18 @@ NETBSD_ATF_TESTS_SH=	getaddrinfo_test
 
 PROGS=		h_gai
 
-FILESDIR=	${TESTSDIR}/data
+FILESGROUPS+=	${PACKAGE}DATA_FILES
+${PACKAGE}DATA_FILESPACKAGE=	tests
+
+${PACKAGE}DATA_FILESDIR=	${TESTSDIR}/data
 
-FILES=		basics_v4.exp	basics_v4v6.exp
-FILES+=		no_host_v4.exp	no_host_v4v6.exp
-FILES+=		no_serv_v4.exp	no_serv_v4v6.exp
-FILES+=		sock_raw_v4.exp	sock_raw_v4v6.exp
-FILES+=		spec_fam_v4.exp	spec_fam_v4v6.exp
-FILES+=		scoped.exp
-FILES+=		unsup_fam.exp
+${PACKAGE}DATA_FILES+=		basics_v4.exp	basics_v4v6.exp
+${PACKAGE}DATA_FILES+=		no_host_v4.exp	no_host_v4v6.exp
+${PACKAGE}DATA_FILES+=		no_serv_v4.exp	no_serv_v4v6.exp
+${PACKAGE}DATA_FILES+=		sock_raw_v4.exp	sock_raw_v4v6.exp
+${PACKAGE}DATA_FILES+=		spec_fam_v4.exp	spec_fam_v4v6.exp
+${PACKAGE}DATA_FILES+=		scoped.exp
+${PACKAGE}DATA_FILES+=		unsup_fam.exp
 
 .include "../../Makefile.netbsd-tests"
 
diff --git a/lib/libc/tests/nss/Makefile b/lib/libc/tests/nss/Makefile
index da676a7..79f13c5 100644
--- a/lib/libc/tests/nss/Makefile
+++ b/lib/libc/tests/nss/Makefile
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
+
 TESTSDIR=	${TESTSBASE}/lib/libc/nss
 
 BINDIR=		${TESTSDIR}
 
 .PATH: ${.CURDIR:H}/resolv
 
-FILES+=		mach
+${PACKAGE}FILES+=	mach
 
 CFLAGS+=	-I${SRCTOP}/tests
 
diff --git a/lib/libc/tests/regex/Makefile b/lib/libc/tests/regex/Makefile
index f60d512..c4f4351 100644
--- a/lib/libc/tests/regex/Makefile
+++ b/lib/libc/tests/regex/Makefile
@@ -3,8 +3,6 @@
 .include <bsd.own.mk>
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 
 BINDIR=		${TESTSDIR}
 
@@ -16,35 +14,39 @@ SRCS.h_regex=	main.c split.c debug.c
 
 NETBSD_ATF_TESTS_SH=	regex_test
 
-FILESDIR=	${TESTSDIR}/data
-FILES+=		README
-FILES+=		data/anchor.in
-FILES+=		data/backref.in
-FILES+=		data/basic.in
-FILES+=		data/bracket.in
-FILES+=		data/c_comments.in
-FILES+=		data/complex.in
-FILES+=		data/error.in
-FILES+=		data/meta.in
-FILES+=		data/nospec.in
-FILES+=		data/paren.in
-FILES+=		data/regress.in
-FILES+=		data/repet_bounded.in
-FILES+=		data/repet_multi.in
-FILES+=		data/repet_ordinary.in
-FILES+=		data/startend.in
-FILES+=		data/subexp.in
-FILES+=		data/subtle.in
-FILES+=		data/word_bound.in
-FILES+=		data/zero.in
-#FILES+=		data/att/README
-FILES+=		data/att/basic.dat
-FILES+=		data/att/categorization.dat
-FILES+=		data/att/forcedassoc.dat
-FILES+=		data/att/leftassoc.dat
-FILES+=		data/att/nullsubexpr.dat
-FILES+=		data/att/repetition.dat
-FILES+=		data/att/rightassoc.dat
+${PACKAGE}FILES+=		README
+
+FILESGROUPS+=	${PACKAGE}DATA_FILES
+${PACKAGE}DATA_FILESPACKAGE=${PACKAGE}
+
+${PACKAGE}DATA_FILESDIR=	${TESTSDIR}/data
+${PACKAGE}DATA_FILES+=		data/anchor.in
+${PACKAGE}DATA_FILES+=		data/backref.in
+${PACKAGE}DATA_FILES+=		data/basic.in
+${PACKAGE}DATA_FILES+=		data/bracket.in
+${PACKAGE}DATA_FILES+=		data/c_comments.in
+${PACKAGE}DATA_FILES+=		data/complex.in
+${PACKAGE}DATA_FILES+=		data/error.in
+${PACKAGE}DATA_FILES+=		data/meta.in
+${PACKAGE}DATA_FILES+=		data/nospec.in
+${PACKAGE}DATA_FILES+=		data/paren.in
+${PACKAGE}DATA_FILES+=		data/regress.in
+${PACKAGE}DATA_FILES+=		data/repet_bounded.in
+${PACKAGE}DATA_FILES+=		data/repet_multi.in
+${PACKAGE}DATA_FILES+=		data/repet_ordinary.in
+${PACKAGE}DATA_FILES+=		data/startend.in
+${PACKAGE}DATA_FILES+=		data/subexp.in
+${PACKAGE}DATA_FILES+=		data/subtle.in
+${PACKAGE}DATA_FILES+=		data/word_bound.in
+${PACKAGE}DATA_FILES+=		data/zero.in
+#${PACKAGE}DATA_FILES+=		data/att/README
+${PACKAGE}DATA_FILES+=		data/att/basic.dat
+${PACKAGE}DATA_FILES+=		data/att/categorization.dat
+${PACKAGE}DATA_FILES+=		data/att/forcedassoc.dat
+${PACKAGE}DATA_FILES+=		data/att/leftassoc.dat
+${PACKAGE}DATA_FILES+=		data/att/nullsubexpr.dat
+${PACKAGE}DATA_FILES+=		data/att/repetition.dat
+${PACKAGE}DATA_FILES+=		data/att/rightassoc.dat
 
 NETBSD_ATF_TESTS_C=	exhaust_test
 NETBSD_ATF_TESTS_C+=	regex_att_test
diff --git a/lib/libc/tests/resolv/Makefile b/lib/libc/tests/resolv/Makefile
index cc17ef5..cb82da6 100644
--- a/lib/libc/tests/resolv/Makefile
+++ b/lib/libc/tests/resolv/Makefile
@@ -1,13 +1,10 @@
 # $FreeBSD$
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-TESTSDIR=	${TESTSBASE}/lib/libc/resolv
 
-BINDIR=		${TESTSDIR}
+TESTSDIR=	${TESTSBASE}/lib/libc/resolv
 
-FILES+=		mach
+${PACKAGE}FILES+=		mach
 
 ATF_TESTS_C+=	resolv_test
 
diff --git a/lib/libc/tests/rpc/Makefile b/lib/libc/tests/rpc/Makefile
index 6a6ae7b..d7780ef 100644
--- a/lib/libc/tests/rpc/Makefile
+++ b/lib/libc/tests/rpc/Makefile
@@ -1,9 +1,5 @@
 # $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 b645b4d..39b0a96 100644
--- a/lib/libc/tests/setjmp/Makefile
+++ b/lib/libc/tests/setjmp/Makefile
@@ -1,9 +1,5 @@
 # $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 11ccca9..2ac74aa 100644
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -2,10 +2,6 @@
 
 .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 50484fd..72685e0 100644
--- a/lib/libc/tests/stdio/Makefile
+++ b/lib/libc/tests/stdio/Makefile
@@ -2,10 +2,6 @@
 
 .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 08f34b0..87e84c5 100644
--- a/lib/libc/tests/stdlib/Makefile
+++ b/lib/libc/tests/stdlib/Makefile
@@ -1,9 +1,5 @@
 # $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 a8db9c3..ea2dfcf 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 ATF_TESTS_C+=		memcmp_test
 ATF_TESTS_C+=		stpncpy_test
 ATF_TESTS_C+=		strerror2_test
diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile
index e79204a..6711287 100644
--- a/lib/libc/tests/sys/Makefile
+++ b/lib/libc/tests/sys/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 ATF_TESTS_C+=			queue_test
 
 # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,
@@ -72,7 +68,7 @@ WARNS?=			3
 WARNS?=			4
 .endif
 
-FILESGROUPS+=		FILES truncate_test_FILES
+FILESGROUPS+=		truncate_test_FILES
 
 truncate_test_FILES=	truncate_test.root_owned
 truncate_test_FILESDIR=	${TESTSDIR}
@@ -80,7 +76,6 @@ truncate_test_FILESMODE= 0600
 truncate_test_FILESOWNER= root
 truncate_test_FILESGRP= wheel
 truncate_test_FILESPACKAGE=	${PACKAGE}
-FILESPACKAGE=		${PACKAGE}
 
 CLEANFILES=	truncate_test.root_owned
 truncate_test.root_owned:
diff --git a/lib/libc/tests/termios/Makefile b/lib/libc/tests/termios/Makefile
index 81b0ff1..0495d68 100644
--- a/lib/libc/tests/termios/Makefile
+++ b/lib/libc/tests/termios/Makefile
@@ -2,10 +2,6 @@
 
 .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 49745e2..feb543d 100644
--- a/lib/libc/tests/time/Makefile
+++ b/lib/libc/tests/time/Makefile
@@ -2,10 +2,6 @@
 
 .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 0e98fed..cbf441d 100644
--- a/lib/libc/tests/tls/Makefile
+++ b/lib/libc/tests/tls/Makefile
@@ -2,10 +2,6 @@
 
 .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 74f826a..84225f4 100644
--- a/lib/libc/tests/tls/dso/Makefile
+++ b/lib/libc/tests/tls/dso/Makefile
@@ -1,10 +1,5 @@
 # $FreeBSD$
 
-PACKAGE= tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
-OBJTOP=		${.OBJDIR:H:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
 
 LIB=		h_tls_dlopen
diff --git a/lib/libc/tests/tls_dso/Makefile b/lib/libc/tests/tls_dso/Makefile
index 79b05f8..5449799 100644
--- a/lib/libc/tests/tls_dso/Makefile
+++ b/lib/libc/tests/tls_dso/Makefile
@@ -2,10 +2,6 @@
 
 .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 c9520fb..d5b8f01 100644
--- a/lib/libc/tests/ttyio/Makefile
+++ b/lib/libc/tests/ttyio/Makefile
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
-
 # TODO: ptm_test
 NETBSD_ATF_TESTS_C=	ttyio_test