From 49dae58b287906be26f56ba3e3dc693c3ba8cf37 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Fri, 29 Apr 2016 05:28:40 +0000 Subject: [PATCH] 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 --- bin/tests/Makefile | 3 ++- cddl/lib/tests/Makefile | 3 ++- cddl/sbin/tests/Makefile | 3 ++- cddl/tests/Makefile | 3 ++- cddl/usr.bin/tests/Makefile | 3 ++- cddl/usr.sbin/tests/Makefile | 3 ++- gnu/lib/tests/Makefile | 3 ++- gnu/tests/Makefile | 3 ++- gnu/usr.bin/tests/Makefile | 3 ++- lib/atf/libatf-c/tests/detail/Makefile | 3 ++- lib/atf/tests/Makefile | 3 ++- lib/atf/tests/test-programs/Makefile | 3 ++- lib/tests/Makefile | 3 ++- libexec/atf/atf-sh/tests/Makefile | 3 ++- libexec/atf/tests/Makefile | 3 ++- libexec/tests/Makefile | 5 +++-- sbin/tests/Makefile | 3 ++- secure/lib/tests/Makefile | 3 ++- secure/libexec/tests/Makefile | 3 ++- secure/tests/Makefile | 3 ++- secure/usr.bin/tests/Makefile | 3 ++- secure/usr.sbin/tests/Makefile | 3 ++- share/examples/tests/Makefile | 3 ++- share/examples/tests/tests/Makefile | 3 ++- share/examples/tests/tests/atf/Makefile | 3 ++- share/examples/tests/tests/plain/Makefile | 3 ++- share/tests/Makefile | 3 ++- tests/Makefile | 3 ++- tests/etc/Makefile | 3 ++- usr.bin/tests/Makefile | 3 ++- usr.sbin/tests/Makefile | 3 ++- 31 files changed, 63 insertions(+), 32 deletions(-) diff --git a/bin/tests/Makefile b/bin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/bin/tests/Makefile +++ b/bin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/cddl/lib/tests/Makefile +++ b/cddl/lib/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/cddl/sbin/tests/Makefile +++ b/cddl/sbin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/cddl/tests/Makefile +++ b/cddl/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/cddl/usr.bin/tests/Makefile +++ b/cddl/usr.bin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/cddl/usr.sbin/tests/Makefile b/cddl/usr.sbin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/cddl/usr.sbin/tests/Makefile +++ b/cddl/usr.sbin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/gnu/lib/tests/Makefile +++ b/gnu/lib/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/gnu/tests/Makefile b/gnu/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/gnu/tests/Makefile +++ b/gnu/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/gnu/usr.bin/tests/Makefile b/gnu/usr.bin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/gnu/usr.bin/tests/Makefile +++ b/gnu/usr.bin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index 296d2dd0a31f..13f3819d1452 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index ee998049e845..44ed72876fb9 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf TESTS+= Kyuafile diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile index 24f7b799880f..4d756cf6dfa2 100644 --- a/lib/atf/tests/test-programs/Makefile +++ b/lib/atf/tests/test-programs/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/test-programs TESTS+= Kyuafile diff --git a/lib/tests/Makefile b/lib/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile index db2200b49019..b52c88d5d989 100644 --- a/libexec/atf/atf-sh/tests/Makefile +++ b/libexec/atf/atf-sh/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/libexec/atf/tests/Makefile +++ b/libexec/atf/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile index 04afe9ae889a..06058a0be5e4 100644 --- a/libexec/tests/Makefile +++ b/libexec/tests/Makefile @@ -2,10 +2,11 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} -TEST+= Kyuafile +TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/sbin/tests/Makefile +++ b/sbin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/secure/lib/tests/Makefile +++ b/secure/lib/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/tests/Makefile b/secure/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/secure/tests/Makefile +++ b/secure/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/secure/usr.bin/tests/Makefile +++ b/secure/usr.bin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/secure/usr.sbin/tests/Makefile +++ b/secure/usr.sbin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/share/examples/tests/Makefile b/share/examples/tests/Makefile index c543aa3957b1..77d89a4880ad 100644 --- a/share/examples/tests/Makefile +++ b/share/examples/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/share/examples/tests/tests/Makefile b/share/examples/tests/tests/Makefile index c41753143bbd..08b60493afb4 100644 --- a/share/examples/tests/tests/Makefile +++ b/share/examples/tests/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} # Directory into which the Kyuafile provided by this directory will be diff --git a/share/examples/tests/tests/atf/Makefile b/share/examples/tests/tests/atf/Makefile index ef96dcb14aba..6628a21775ba 100644 --- a/share/examples/tests/tests/atf/Makefile +++ b/share/examples/tests/tests/atf/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/share/examples/tests/tests/plain/Makefile b/share/examples/tests/tests/plain/Makefile index 0b82397a438d..e01de619654d 100644 --- a/share/examples/tests/tests/plain/Makefile +++ b/share/examples/tests/tests/plain/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/share/tests/Makefile b/share/tests/Makefile index 6448a415f9b3..f3c2ef3ee8da 100644 --- a/share/tests/Makefile +++ b/share/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile TESTSDIR= ${TESTSBASE}/share diff --git a/tests/Makefile b/tests/Makefile index ba743ee31df5..92e462f03ea3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/tests/etc/Makefile b/tests/etc/Makefile index 7e73a48f35c5..6e02e3214d4e 100644 --- a/tests/etc/Makefile +++ b/tests/etc/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/usr.bin/tests/Makefile b/usr.bin/tests/Makefile index e8e8e80b102b..77a87ead1b1c 100644 --- a/usr.bin/tests/Makefile +++ b/usr.bin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile index 609357e57d33..06058a0be5e4 100644 --- a/usr.sbin/tests/Makefile +++ b/usr.sbin/tests/Makefile @@ -2,8 +2,9 @@ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile