Index: head/bin/tests/Makefile =================================================================== --- head/bin/tests/Makefile (revision 298767) +++ head/bin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/lib/tests/Makefile =================================================================== --- head/cddl/lib/tests/Makefile (revision 298767) +++ head/cddl/lib/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/sbin/tests/Makefile =================================================================== --- head/cddl/sbin/tests/Makefile (revision 298767) +++ head/cddl/sbin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/tests/Makefile =================================================================== --- head/cddl/tests/Makefile (revision 298767) +++ head/cddl/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/usr.bin/tests/Makefile =================================================================== --- head/cddl/usr.bin/tests/Makefile (revision 298767) +++ head/cddl/usr.bin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/usr.sbin/tests/Makefile =================================================================== --- head/cddl/usr.sbin/tests/Makefile (revision 298767) +++ head/cddl/usr.sbin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/lib/tests/Makefile =================================================================== --- head/gnu/lib/tests/Makefile (revision 298767) +++ head/gnu/lib/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/tests/Makefile =================================================================== --- head/gnu/tests/Makefile (revision 298767) +++ head/gnu/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/usr.bin/tests/Makefile =================================================================== --- head/gnu/usr.bin/tests/Makefile (revision 298767) +++ head/gnu/usr.bin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/lib/atf/libatf-c/tests/detail/Makefile =================================================================== --- head/lib/atf/libatf-c/tests/detail/Makefile (revision 298767) +++ head/lib/atf/libatf-c/tests/detail/Makefile (revision 298768) @@ -1,40 +1,41 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c/detail CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} .for _T in dynstr_test \ env_test \ fs_test \ list_test \ map_test \ process_test \ sanity_test \ text_test \ user_test ATF_TESTS_C+= ${_T} SRCS.${_T}= ${_T}.c test_helpers.c .endfor .for p in process_helpers version_helper PROGS+= ${p} SRCS.${p}= ${p}.c MAN.${p}= # defined BINDIR.${p}= ${TESTSDIR} .endfor version_helper.o: atf-version .include "../../../common.mk" .include Index: head/lib/atf/tests/Makefile =================================================================== --- head/lib/atf/tests/Makefile (revision 298767) +++ head/lib/atf/tests/Makefile (revision 298768) @@ -1,17 +1,18 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR= test-programs .include Index: head/lib/atf/tests/test-programs/Makefile =================================================================== --- head/lib/atf/tests/test-programs/Makefile (revision 298767) +++ head/lib/atf/tests/test-programs/Makefile (revision 298768) @@ -1,28 +1,29 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/test-programs TESTS+= Kyuafile KYUAFILE= yes ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/test-programs CFLAGS+= -I${ATF} ATF_TESTS_C= c_helpers ATF_TESTS_CXX= cpp_helpers SRCS.cpp_helpers= cpp_helpers.cpp ATF_TESTS_SH= sh_helpers .for _T in config_test expect_test meta_data_test result_test srcdir_test ATF_TESTS_SH+= ${_T} ATF_TESTS_SH_SRC_${_T}= common.sh ${_T}.sh .endfor .include Index: head/lib/tests/Makefile =================================================================== --- head/lib/tests/Makefile (revision 298767) +++ head/lib/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/libexec/atf/atf-sh/tests/Makefile =================================================================== --- head/libexec/atf/atf-sh/tests/Makefile (revision 298767) +++ head/libexec/atf/atf-sh/tests/Makefile (revision 298768) @@ -1,33 +1,34 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh ATF_TESTS_SH+= atf_check_test ATF_TESTS_SH+= config_test ATF_TESTS_SH+= integration_test ATF_TESTS_SH+= normalize_test ATF_TESTS_SH+= tc_test ATF_TESTS_SH+= tp_test integration_test: Makefile ATF_TESTS_SH_SED_integration_test= \ -e 's,__ATF_SH__,/usr/libexec/atf-sh,g' SCRIPTS+= misc_helpers SCRIPTSDIR_misc_helpers=${TESTSDIR} CLEANFILES+= misc_helpers misc_helpers.tmp misc_helpers: misc_helpers.sh echo '#! /usr/libexec/atf-sh' >${.TARGET}.tmp cat ${.ALLSRC} >>${.TARGET}.tmp chmod +x ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .include Index: head/libexec/atf/tests/Makefile =================================================================== --- head/libexec/atf/tests/Makefile (revision 298767) +++ head/libexec/atf/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/libexec/tests/Makefile =================================================================== --- head/libexec/tests/Makefile (revision 298767) +++ head/libexec/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} -TEST+= Kyuafile +TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/sbin/tests/Makefile =================================================================== --- head/sbin/tests/Makefile (revision 298767) +++ head/sbin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/lib/tests/Makefile =================================================================== --- head/secure/lib/tests/Makefile (revision 298767) +++ head/secure/lib/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/libexec/tests/Makefile =================================================================== --- head/secure/libexec/tests/Makefile (revision 298767) +++ head/secure/libexec/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/tests/Makefile =================================================================== --- head/secure/tests/Makefile (revision 298767) +++ head/secure/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/usr.bin/tests/Makefile =================================================================== --- head/secure/usr.bin/tests/Makefile (revision 298767) +++ head/secure/usr.bin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/usr.sbin/tests/Makefile =================================================================== --- head/secure/usr.sbin/tests/Makefile (revision 298767) +++ head/secure/usr.sbin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/share/examples/tests/Makefile =================================================================== --- head/share/examples/tests/Makefile (revision 298767) +++ head/share/examples/tests/Makefile (revision 298768) @@ -1,15 +1,16 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile SUBDIR= tests .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/share/examples/tests/tests/Makefile =================================================================== --- head/share/examples/tests/tests/Makefile (revision 298767) +++ head/share/examples/tests/tests/Makefile (revision 298768) @@ -1,31 +1,32 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} # Directory into which the Kyuafile provided by this directory will be # installed. # # This is always a subdirectory of ${TESTSBASE}/. The remainder of the # path has to match the relative path within the source tree in which # these files are found modulo the tests/ component at the end. # # For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR # would point at ${TESTSBASE}/bin/cp/. TESTSDIR= ${TESTSBASE}/share/examples/tests # List of subdirectories into which we want to recurse during the build # of the system. We use TESTS_SUBDIRS instead of SUBDIR because we want # the auto-generated Kyuafile to recurse into these directories. TESTS_SUBDIRS= atf plain # We leave KYUAFILE unset so that bsd.test.mk auto-generates a Kyuafile # for us based on the contents of the TESTS_SUBDIRS line above. The # generated file will tell the tests run-time engine to recurse into the # directories listed above. #KYUAFILE= auto .include Index: head/share/examples/tests/tests/atf/Makefile =================================================================== --- head/share/examples/tests/tests/atf/Makefile (revision 298767) +++ head/share/examples/tests/tests/atf/Makefile (revision 298768) @@ -1,35 +1,36 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile # Directory into which the Kyuafile provided by this directory will be # installed. # # This is always a subdirectory of ${TESTSBASE}/. The remainder of the # path has to match the relative path within the source tree in which # these files are found modulo the tests/ component at the end. # # For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR # would point at ${TESTSBASE}/bin/cp/. TESTSDIR= ${TESTSBASE}/share/examples/tests/atf # List of test programs to build. Note that we can build more than one # test from a single directory, and this is expected. ATF_TESTS_C= printf_test ATF_TESTS_SH= cp_test # Tell bsd.test.mk that we are providing a hand-crafted Kyuafile in this # directory. We do so because the file in this directory exists for # documentation purposes. # # In general, however, you should NOT define KYUAFILE at all to allow # bsd.test.mk auto-generate one for you based on the ATF_TESTS_* # definitions from above. KYUAFILE= yes .include Index: head/share/examples/tests/tests/plain/Makefile =================================================================== --- head/share/examples/tests/tests/plain/Makefile (revision 298767) +++ head/share/examples/tests/tests/plain/Makefile (revision 298768) @@ -1,35 +1,36 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile # Directory into which the Kyuafile provided by this directory will be # installed. # # This is always a subdirectory of ${TESTSBASE}/. The remainder of the # path has to match the relative path within the source tree in which # these files are found modulo the tests/ component at the end. # # For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR # would point at ${TESTSBASE}/bin/cp/. TESTSDIR= ${TESTSBASE}/share/examples/tests/plain # List of test programs to build. Note that we can build more than one # test from a single directory, and this is expected. PLAIN_TESTS_C= printf_test PLAIN_TESTS_SH= cp_test # Tell bsd.test.mk that we are providing a hand-crafted Kyuafile in this # directory. We do so because the file in this directory exists for # documentation purposes. # # In general, however, you should NOT define KYUAFILE at all to allow # bsd.test.mk auto-generate one for you based on the PLAIN_TESTS_* # definitions from above. KYUAFILE= yes .include Index: head/share/tests/Makefile =================================================================== --- head/share/tests/Makefile (revision 298767) +++ head/share/tests/Makefile (revision 298768) @@ -1,14 +1,15 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile TESTSDIR= ${TESTSBASE}/share .PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/tests/Makefile =================================================================== --- head/tests/Makefile (revision 298767) +++ head/tests/Makefile (revision 298768) @@ -1,24 +1,25 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile SUBDIR+= etc SUBDIR+= sys SUBDIR_PARALLEL= TESTSDIR= ${TESTSBASE} KYUAFILE= yes FILES+= README FILESDIR_README= ${TESTSDIR} afterinstall: install-tests-local install-tests-local: .PHONY ${INSTALL_SYMLINK} ../local/tests ${DESTDIR}${TESTSDIR}/local .include Index: head/tests/etc/Makefile =================================================================== --- head/tests/etc/Makefile (revision 298767) +++ head/tests/etc/Makefile (revision 298768) @@ -1,17 +1,18 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile TESTSDIR= ${TESTSBASE}/etc .PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR+= rc.d .include Index: head/usr.bin/tests/Makefile =================================================================== --- head/usr.bin/tests/Makefile (revision 298767) +++ head/usr.bin/tests/Makefile (revision 298768) @@ -1,16 +1,17 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes FILESDIR= ${TESTSDIR} FILES= regress.m4 .include Index: head/usr.sbin/tests/Makefile =================================================================== --- head/usr.sbin/tests/Makefile (revision 298767) +++ head/usr.sbin/tests/Makefile (revision 298768) @@ -1,13 +1,14 @@ # $FreeBSD$ .include +FILESGROUPS= FILES PACKAGE= tests -FILESGROUPS= TESTS +FILESGROUPS+= TESTS TESTSPACKAGE= ${PACKAGE} TESTS+= Kyuafile .PATH: ${SRCTOP}/tests KYUAFILE= yes .include