Fix including Kyuafile in packaged base system.

Fix a related typo while here. Note, this change results in the Kyuafile inclusion in the runtime package, which needs to be fixed, however addresses the PR as far as I can tell in my tests. PR: 209114 Submitted by: ngie Sponsored by: The FreeBSD Foundation
2016-04-29 05:28:40 +00:00 · 2016-04-29 05:28:40 +00:00 · 49dae58b28
commit 49dae58b28
parent ce725c8e00
31 changed files with 63 additions and 32 deletions
--- a/bin/tests/Makefile
+++ b/bin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/cddl/lib/tests/Makefile
+++ b/cddl/lib/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/cddl/sbin/tests/Makefile
+++ b/cddl/sbin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/cddl/tests/Makefile
+++ b/cddl/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/cddl/usr.bin/tests/Makefile
+++ b/cddl/usr.bin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/cddl/usr.sbin/tests/Makefile
+++ b/cddl/usr.sbin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/gnu/lib/tests/Makefile
+++ b/gnu/lib/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/gnu/tests/Makefile
+++ b/gnu/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/gnu/usr.bin/tests/Makefile
+++ b/gnu/usr.bin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/lib/atf/libatf-c/tests/detail/Makefile
+++ b/lib/atf/libatf-c/tests/detail/Makefile
@ -2,8 +2,9 @@

 .include <bsd.init.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/lib/atf/tests/Makefile
+++ b/lib/atf/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf
 TESTS+=		Kyuafile
--- a/lib/atf/tests/test-programs/Makefile
+++ b/lib/atf/tests/test-programs/Makefile
@ -2,8 +2,9 @@

 .include <bsd.init.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf/test-programs
 TESTS+=		Kyuafile
--- a/lib/tests/Makefile
+++ b/lib/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/libexec/atf/atf-sh/tests/Makefile
+++ b/libexec/atf/atf-sh/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.init.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/libexec/atf/tests/Makefile
+++ b/libexec/atf/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

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

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
-TEST+=		Kyuafile
+TESTS+=		Kyuafile

 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
--- a/sbin/tests/Makefile
+++ b/sbin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/secure/lib/tests/Makefile
+++ b/secure/lib/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/secure/libexec/tests/Makefile
+++ b/secure/libexec/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/secure/tests/Makefile
+++ b/secure/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/secure/usr.bin/tests/Makefile
+++ b/secure/usr.bin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/secure/usr.sbin/tests/Makefile
+++ b/secure/usr.sbin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/share/examples/tests/Makefile
+++ b/share/examples/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/share/examples/tests/tests/Makefile
+++ b/share/examples/tests/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}

 # Directory into which the Kyuafile provided by this directory will be
--- a/share/examples/tests/tests/atf/Makefile
+++ b/share/examples/tests/tests/atf/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/share/examples/tests/tests/plain/Makefile
+++ b/share/examples/tests/tests/plain/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/share/tests/Makefile
+++ b/share/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 TESTSDIR=	${TESTSBASE}/share
--- a/tests/Makefile
+++ b/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE= tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/tests/etc/Makefile
+++ b/tests/etc/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/usr.bin/tests/Makefile
+++ b/usr.bin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile

--- a/usr.sbin/tests/Makefile
+++ b/usr.sbin/tests/Makefile
@ -2,8 +2,9 @@

 .include <bsd.own.mk>

+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile