Index: stable/11/share/examples/tests/tests/Makefile =================================================================== --- stable/11/share/examples/tests/tests/Makefile (revision 321646) +++ stable/11/share/examples/tests/tests/Makefile (revision 321647) @@ -1,28 +1,30 @@ # $FreeBSD$ -.include - # 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 +# +# The default path specified by bsd.test.mk is `${TESTSBASE}/${RELDIR:H}`, +# which happens to be the same as `${TESTSBASE}/share/examples/tests`. +#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 +TESTS_SUBDIRS+= atf +TESTS_SUBDIRS+= plain TESTS_SUBDIRS+= tap # 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: stable/11/share/examples/tests/tests/atf/Makefile =================================================================== --- stable/11/share/examples/tests/tests/atf/Makefile (revision 321646) +++ stable/11/share/examples/tests/tests/atf/Makefile (revision 321647) @@ -1,51 +1,49 @@ # $FreeBSD$ -.include - # The release package to use for the tests contained within the directory # # This applies to components which rely on ^/projects/release-pkg support # (see UPDATING XXXXXXXXX / svn revision r298107). PACKAGE= tests # 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 -# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional +# Install file1 and file2 as files via bsd.progs.mk. Please note the intentional # ${PACKAGE} namespace of files. # -# The basic semantics of this are the same as FILES in bsd.prog.mk, e.g. the +# The basic semantics of this are the same as FILES in bsd.progs.mk, e.g. the # installation of the files can be manipulated via ${PACKAGE}FILESDIR, # ${PACKAGE}FILESMODE, etc. # # Please see comment above about ${PACKAGE}. Feel free to omit the ${PACKAGE} # namespace if release package support isn't needed. ${PACKAGE}FILES+= file1 CLEANFILES+= file1 file1: @echo "File 1" > ${.TARGET} .include Index: stable/11/share/examples/tests/tests/plain/Makefile =================================================================== --- stable/11/share/examples/tests/tests/plain/Makefile (revision 321646) +++ stable/11/share/examples/tests/tests/plain/Makefile (revision 321647) @@ -1,51 +1,49 @@ # $FreeBSD$ -.include - # The release package to use for the tests contained within the directory # # This applies to components which rely on ^/projects/release-pkg support # (see UPDATING XXXXXXXXX / svn revision r298107). PACKAGE= tests # 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 -# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional +# Install file1 and file2 as files via bsd.progs.mk. Please note the intentional # ${PACKAGE} namespace of files. # -# The basic semantics of this are the same as FILES in bsd.prog.mk, e.g. the +# The basic semantics of this are the same as FILES in bsd.progs.mk, e.g. the # installation of the files can be manipulated via ${PACKAGE}FILESDIR, # ${PACKAGE}FILESMODE, etc. # # Please see comment above about ${PACKAGE}. Feel free to omit the ${PACKAGE} # namespace if release package support isn't needed. ${PACKAGE}FILES+= file1 CLEANFILES+= file1 file1: @echo "File 1" > ${.TARGET} .include Index: stable/11 =================================================================== --- stable/11 (revision 321646) +++ stable/11 (revision 321647) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r320441-320442