More 'tests' packaging fixes.

Sponsored by: The FreeBSD Foundation
2016-02-03 19:08:45 +00:00 · 2016-02-03 19:08:45 +00:00 · ae6f203603
commit ae6f203603
parent 1bdf892d49
42 changed files with 174 additions and 2 deletions
--- a/bin/tests/Makefile
+++ b/bin/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes

--- a/cddl/tests/Makefile
+++ b/cddl/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes

--- a/gnu/tests/Makefile
+++ b/gnu/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes

--- a/gnu/usr.bin/diff/tests/Makefile
+++ b/gnu/usr.bin/diff/tests/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/usr.bin/diff

 NETBSD_ATF_TESTS_SH=	diff_test
--- a/lib/atf/libatf-c++/tests/detail/Makefile
+++ b/lib/atf/libatf-c++/tests/detail/Makefile
@ -3,6 +3,8 @@
 .include <bsd.init.mk>

 PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail

 ATF=		${SRCTOP}/contrib/atf
--- a/lib/atf/libatf-c/tests/detail/Makefile
+++ b/lib/atf/libatf-c/tests/detail/Makefile
@ -2,6 +2,11 @@

 .include <bsd.init.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c/detail

 ATF=		${SRCTOP}/contrib/atf
--- a/lib/libc/tests/sys/Makefile
+++ b/lib/libc/tests/sys/Makefile
@ -72,13 +72,15 @@ WARNS?=			3
 WARNS?=			4
 .endif

-FILESGROUPS=		FILES truncate_test_FILES
+FILESGROUPS+=		FILES truncate_test_FILES

 truncate_test_FILES=	truncate_test.root_owned
 truncate_test_FILESDIR=	${TESTSDIR}
 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:
--- a/libexec/atf/atf-check/tests/Makefile
+++ b/libexec/atf/atf-check/tests/Makefile
@ -2,6 +2,10 @@

 .include <bsd.init.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-sh

--- a/libexec/atf/atf-sh/tests/Makefile
+++ b/libexec/atf/atf-sh/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.init.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-sh

--- a/libexec/tests/Makefile
+++ b/libexec/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TEST+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes

--- a/sbin/tests/Makefile
+++ b/sbin/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes

--- a/secure/tests/Makefile
+++ b/secure/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes

--- a/share/examples/tests/tests/atf/Makefile
+++ b/share/examples/tests/tests/atf/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 # Directory into which the Kyuafile provided by this directory will be
 # installed.
 #
--- a/share/tests/Makefile
+++ b/share/tests/Makefile
@ -2,6 +2,10 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
 TESTSDIR=	${TESTSBASE}/share

 .PATH:		${SRCTOP}/tests
--- a/tests/Makefile
+++ b/tests/Makefile
@ -5,6 +5,7 @@
 PACKAGE= tests
 FILESGROUPS=	TESTS
 TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile

 SUBDIR+= etc
 SUBDIR+= sys
--- a/tests/sys/geom/class/concat/Makefile
+++ b/tests/sys/geom/class/concat/Makefile
@ -1,6 +1,10 @@
 # $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
--- a/tests/sys/geom/class/eli/Makefile
+++ b/tests/sys/geom/class/eli/Makefile
@ -1,6 +1,10 @@
 # $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
--- a/tests/sys/geom/class/gate/Makefile
+++ b/tests/sys/geom/class/gate/Makefile
@ -1,6 +1,10 @@
 # $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
--- a/tests/sys/geom/class/mirror/Makefile
+++ b/tests/sys/geom/class/mirror/Makefile
@ -1,6 +1,10 @@
 # $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
--- a/tests/sys/geom/class/nop/Makefile
+++ b/tests/sys/geom/class/nop/Makefile
@ -1,6 +1,10 @@
 # $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
--- a/tests/sys/geom/class/raid3/Makefile
+++ b/tests/sys/geom/class/raid3/Makefile
@ -1,6 +1,10 @@
 # $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
--- a/tests/sys/geom/class/shsec/Makefile
+++ b/tests/sys/geom/class/shsec/Makefile
@ -1,6 +1,10 @@
 # $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
--- a/tests/sys/geom/class/stripe/Makefile
+++ b/tests/sys/geom/class/stripe/Makefile
@ -1,6 +1,10 @@
 # $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
--- a/tests/sys/geom/class/uzip/Makefile
+++ b/tests/sys/geom/class/uzip/Makefile
@ -4,7 +4,11 @@
 # Regression test for geom_uzip.
 #

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/sys/geom/class/${.CURDIR:T}
+TESTS+=		${FILES}

 IMAGE=		1.img
 ZIMAGE=		${IMAGE}.uzip
--- a/tests/sys/pjdfstest/tests/chflags/Makefile
+++ b/tests/sys/pjdfstest/tests/chflags/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/chmod/Makefile
+++ b/tests/sys/pjdfstest/tests/chmod/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/chown/Makefile
+++ b/tests/sys/pjdfstest/tests/chown/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/ftruncate/Makefile
+++ b/tests/sys/pjdfstest/tests/ftruncate/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/granular/Makefile
+++ b/tests/sys/pjdfstest/tests/granular/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/link/Makefile
+++ b/tests/sys/pjdfstest/tests/link/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/mkdir/Makefile
+++ b/tests/sys/pjdfstest/tests/mkdir/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/mkfifo/Makefile
+++ b/tests/sys/pjdfstest/tests/mkfifo/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/mknod/Makefile
+++ b/tests/sys/pjdfstest/tests/mknod/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/open/Makefile
+++ b/tests/sys/pjdfstest/tests/open/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/rename/Makefile
+++ b/tests/sys/pjdfstest/tests/rename/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/rmdir/Makefile
+++ b/tests/sys/pjdfstest/tests/rmdir/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/symlink/Makefile
+++ b/tests/sys/pjdfstest/tests/symlink/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/truncate/Makefile
+++ b/tests/sys/pjdfstest/tests/truncate/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/tests/sys/pjdfstest/tests/unlink/Makefile
+++ b/tests/sys/pjdfstest/tests/unlink/Makefile
@ -1,5 +1,9 @@
 # $FreeBSD$

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	00
 TAP_TESTS_SH+=	01
 TAP_TESTS_SH+=	02
--- a/usr.bin/tests/Makefile
+++ b/usr.bin/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes

--- a/usr.bin/yacc/tests/Makefile
+++ b/usr.bin/yacc/tests/Makefile
@ -5,6 +5,7 @@
 PACKAGE=	tests
 FILESGROUPS=	TESTS
 TESTSPACKAGE=	${PACKAGE}
+PACKAGE=	tests

 TEST_DIR=	${SRCTOP}/contrib/byacc/test

@ -21,7 +22,10 @@ SCRIPTSDIR=	${TESTSDIR}

 CLEANFILES=	run_test

-FILESGROUPS=	FILES FILEStest FILEStest_yacc
+FILESGROUPS+=	FILES FILEStest FILEStest_yacc
+FILESPACKAGE=	${PACKAGE}
+FILEStestPACKAGE=${PACKAGE}
+FILEStest_yaccPACKAGE=${PACKAGE}

 FILEStestDIR=	${TESTSDIR}

--- a/usr.sbin/tests/Makefile
+++ b/usr.sbin/tests/Makefile
@ -2,6 +2,11 @@

 .include <bsd.own.mk>

+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes