svn commit: r298768 - in head: bin/tests cddl/lib/tests cddl/sbin/tests cddl/tests cddl/usr.bin/tests cddl/usr.sbin/tests gnu/lib/tests gnu/tests gnu/usr.bin/tests lib/atf/libatf-c/tests/detail lib...

Glen Barber gjb at FreeBSD.org
Fri Apr 29 05:28:45 UTC 2016


Author: gjb
Date: Fri Apr 29 05:28:40 2016
New Revision: 298768
URL: https://svnweb.freebsd.org/changeset/base/298768

Log:
  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

Modified:
  head/bin/tests/Makefile
  head/cddl/lib/tests/Makefile
  head/cddl/sbin/tests/Makefile
  head/cddl/tests/Makefile
  head/cddl/usr.bin/tests/Makefile
  head/cddl/usr.sbin/tests/Makefile
  head/gnu/lib/tests/Makefile
  head/gnu/tests/Makefile
  head/gnu/usr.bin/tests/Makefile
  head/lib/atf/libatf-c/tests/detail/Makefile
  head/lib/atf/tests/Makefile
  head/lib/atf/tests/test-programs/Makefile
  head/lib/tests/Makefile
  head/libexec/atf/atf-sh/tests/Makefile
  head/libexec/atf/tests/Makefile
  head/libexec/tests/Makefile
  head/sbin/tests/Makefile
  head/secure/lib/tests/Makefile
  head/secure/libexec/tests/Makefile
  head/secure/tests/Makefile
  head/secure/usr.bin/tests/Makefile
  head/secure/usr.sbin/tests/Makefile
  head/share/examples/tests/Makefile
  head/share/examples/tests/tests/Makefile
  head/share/examples/tests/tests/atf/Makefile
  head/share/examples/tests/tests/plain/Makefile
  head/share/tests/Makefile
  head/tests/Makefile
  head/tests/etc/Makefile
  head/usr.bin/tests/Makefile
  head/usr.sbin/tests/Makefile

Modified: head/bin/tests/Makefile
==============================================================================
--- head/bin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/bin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/cddl/lib/tests/Makefile
==============================================================================
--- head/cddl/lib/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/cddl/lib/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/cddl/sbin/tests/Makefile
==============================================================================
--- head/cddl/sbin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/cddl/sbin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/cddl/tests/Makefile
==============================================================================
--- head/cddl/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/cddl/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/cddl/usr.bin/tests/Makefile
==============================================================================
--- head/cddl/usr.bin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/cddl/usr.bin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/cddl/usr.sbin/tests/Makefile
==============================================================================
--- head/cddl/usr.sbin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/cddl/usr.sbin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/gnu/lib/tests/Makefile
==============================================================================
--- head/gnu/lib/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/gnu/lib/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/gnu/tests/Makefile
==============================================================================
--- head/gnu/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/gnu/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/gnu/usr.bin/tests/Makefile
==============================================================================
--- head/gnu/usr.bin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/gnu/usr.bin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/lib/atf/libatf-c/tests/detail/Makefile
==============================================================================
--- head/lib/atf/libatf-c/tests/detail/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/lib/atf/libatf-c/tests/detail/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.init.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/lib/atf/tests/Makefile
==============================================================================
--- head/lib/atf/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/lib/atf/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/lib/atf
 TESTS+=		Kyuafile

Modified: head/lib/atf/tests/test-programs/Makefile
==============================================================================
--- head/lib/atf/tests/test-programs/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/lib/atf/tests/test-programs/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -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

Modified: head/lib/tests/Makefile
==============================================================================
--- head/lib/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/lib/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/libexec/atf/atf-sh/tests/Makefile
==============================================================================
--- head/libexec/atf/atf-sh/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/libexec/atf/atf-sh/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.init.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/libexec/atf/tests/Makefile
==============================================================================
--- head/libexec/atf/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/libexec/atf/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/libexec/tests/Makefile
==============================================================================
--- head/libexec/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/libexec/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -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

Modified: head/sbin/tests/Makefile
==============================================================================
--- head/sbin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/sbin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/secure/lib/tests/Makefile
==============================================================================
--- head/secure/lib/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/secure/lib/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/secure/libexec/tests/Makefile
==============================================================================
--- head/secure/libexec/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/secure/libexec/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/secure/tests/Makefile
==============================================================================
--- head/secure/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/secure/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/secure/usr.bin/tests/Makefile
==============================================================================
--- head/secure/usr.bin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/secure/usr.bin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/secure/usr.sbin/tests/Makefile
==============================================================================
--- head/secure/usr.sbin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/secure/usr.sbin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/share/examples/tests/Makefile
==============================================================================
--- head/share/examples/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/share/examples/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/share/examples/tests/tests/Makefile
==============================================================================
--- head/share/examples/tests/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/share/examples/tests/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -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

Modified: head/share/examples/tests/tests/atf/Makefile
==============================================================================
--- head/share/examples/tests/tests/atf/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/share/examples/tests/tests/atf/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/share/examples/tests/tests/plain/Makefile
==============================================================================
--- head/share/examples/tests/tests/plain/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/share/examples/tests/tests/plain/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/share/tests/Makefile
==============================================================================
--- head/share/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/share/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 TESTSDIR=	${TESTSBASE}/share

Modified: head/tests/Makefile
==============================================================================
--- head/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE= tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/tests/etc/Makefile
==============================================================================
--- head/tests/etc/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/tests/etc/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/usr.bin/tests/Makefile
==============================================================================
--- head/usr.bin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/usr.bin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 

Modified: head/usr.sbin/tests/Makefile
==============================================================================
--- head/usr.sbin/tests/Makefile	Fri Apr 29 03:13:18 2016	(r298767)
+++ head/usr.sbin/tests/Makefile	Fri Apr 29 05:28:40 2016	(r298768)
@@ -2,8 +2,9 @@
 
 .include <bsd.own.mk>
 
+FILESGROUPS=	FILES
 PACKAGE=	tests
-FILESGROUPS=	TESTS
+FILESGROUPS+=	TESTS
 TESTSPACKAGE=	${PACKAGE}
 TESTS+=		Kyuafile
 


More information about the svn-src-all mailing list