Index: user/ngie/release-pkg-fix-tests/share/mk/bsd.test.mk =================================================================== --- user/ngie/release-pkg-fix-tests/share/mk/bsd.test.mk (revision 298869) +++ user/ngie/release-pkg-fix-tests/share/mk/bsd.test.mk (revision 298870) @@ -1,93 +1,95 @@ # $FreeBSD$ # # Generic build infrastructure for test programs. # # This is the only public file that should be included by Makefiles when # tests are to be built. All other *.test.mk files are internal and not # to be included directly. .include ____: # Third-party software (kyua, etc) prefix. LOCALBASE?= /usr/local # Tests install directory TESTSDIR?= ${TESTSBASE}/${RELDIR:H} + +FILESGROUPS+= TESTS PACKAGE= tests # List of subdirectories containing tests into which to recurse. This has the # same semantics as SUBDIR at build-time. However, the directories listed here # get registered into the run-time test suite definitions so that the test # engines know to recurse into these directories. # # In other words: list here any directories that contain test programs but use # SUBDIR for directories that may contain helper binaries and/or data files. TESTS_SUBDIRS?= # If defined, indicates that the tests built by the Makefile are not part of # the FreeBSD Test Suite. The implication of this is that the tests won't be # installed under /usr/tests/ and that Kyua won't be able to run them. #NOT_FOR_TEST_SUITE= # List of variables to pass to the tests at run-time via the environment. TESTS_ENV?= # Force all tests in a separate distribution file. # # We want this to be the case even when the distribution name is already # overriden. For example: we want the tests for programs in the 'games' # distribution to end up in the 'tests' distribution; the test programs # themselves have all the necessary logic to detect that the games are not # installed and thus won't cause false negatives. DISTRIBUTION:= tests # Ordered list of directories to construct the PATH for the tests. TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \ ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin TESTS_ENV+= PATH=${TESTS_PATH:tW:C/ +/:/g} # Ordered list of directories to construct the LD_LIBRARY_PATH for the tests. TESTS_LD_LIBRARY_PATH+= ${DESTDIR}/lib ${DESTDIR}/usr/lib TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g} # List of all tests being built. The various *.test.mk modules extend this # variable as needed. _TESTS= # Pull in the definitions of all supported test interfaces. .include .include .include # kyua automatically descends directories; only run make check on the # top-level directory .if !make(check) .for ts in ${TESTS_SUBDIRS} .if empty(SUBDIR:M${ts}) SUBDIR+= ${ts} .endif .endfor SUBDIR_PARALLEL= t .endif # it is rare for test cases to have man pages .if !defined(MAN) MAN= .endif .if !defined(NOT_FOR_TEST_SUITE) .include .endif .if !target(realcheck) realcheck: .PHONY @echo "$@ not defined; skipping" .endif beforecheck realcheck aftercheck check: .PHONY .ORDER: beforecheck realcheck aftercheck check: beforecheck realcheck aftercheck .include Index: user/ngie/release-pkg-fix-tests/share/mk/suite.test.mk =================================================================== --- user/ngie/release-pkg-fix-tests/share/mk/suite.test.mk (revision 298869) +++ user/ngie/release-pkg-fix-tests/share/mk/suite.test.mk (revision 298870) @@ -1,102 +1,101 @@ # $FreeBSD$ # # You must include bsd.test.mk instead of this file from your Makefile. # # Internal glue for the build of /usr/tests/. .if !target(____) .error suite.test.mk cannot be included directly. .endif # Name of the test suite these tests belong to. Should rarely be changed for # Makefiles built into the FreeBSD src tree. TESTSUITE?= FreeBSD # Knob to control the handling of the Kyuafile for this Makefile. # # If 'yes', a Kyuafile exists in the source tree and is installed into # TESTSDIR. # # If 'auto', a Kyuafile is automatically generated based on the list of test # programs built by the Makefile and is installed into TESTSDIR. This is the # default and is sufficient in the majority of the cases. # # If 'no', no Kyuafile is installed. KYUAFILE?= auto # Per-test program interface definition. # # The name provided here must match one of the interface names supported by # Kyua as this is later encoded in the Kyuafile test program definitions. #TEST_INTERFACE.= interface-name # Metadata properties applicable to all test programs. # # All the variables for a test program defined in the Makefile are appended # to the test program's definition in the Kyuafile. This feature can be # used to avoid having to explicitly supply a Kyuafile in the source # directory, allowing the caller Makefile to rely on the KYUAFILE=auto # behavior defined here. #TEST_METADATA+= key="value" # Per-test program metadata properties as a list of key/value pairs. # # These per-test program settings _extend_ the values provided in the # unqualified TEST_METADATA variable. #TEST_METADATA.+= key="value" .if ${KYUAFILE:tl} != "no" -FILESGROUPS+= TESTS TESTS+= Kyuafile .endif .for _T in ${_TESTS} _TEST_METADATA.${_T}= ${TEST_METADATA} ${TEST_METADATA.${_T}} .endfor .if ${KYUAFILE:tl} == "auto" CLEANFILES+= Kyuafile Kyuafile.tmp Kyuafile: Makefile @{ \ echo '-- Automatically generated by bsd.test.mk.'; \ echo; \ echo 'syntax(2)'; \ echo; \ echo 'test_suite("${TESTSUITE}")'; \ echo; \ } > ${.TARGET}.tmp .for _T in ${_TESTS} @echo '${TEST_INTERFACE.${_T}}_test_program{name="${_T}"${_TEST_METADATA.${_T}:C/$/,/:tW:C/^/, /W:C/,$//W}}' \ >>${.TARGET}.tmp .endfor .for _T in ${TESTS_SUBDIRS:N.WAIT} @echo "include(\"${_T}/${.TARGET}\")" >>${.TARGET}.tmp .endfor @mv ${.TARGET}.tmp ${.TARGET} .endif CHECKDIR?= ${DESTDIR}${TESTSDIR} KYUA= ${LOCALBASE}/bin/kyua # Definition of the "make check" target and supporting variables. # # This target, by necessity, can only work for native builds (i.e. a FreeBSD # host building a release for the same system). The target runs Kyua, which is # not in the toolchain, and the tests execute code built for the target host. # # Due to the dependencies of the binaries built by the source tree and how they # are used by tests, it is highly possible for a execution of "make test" to # report bogus results unless the new binaries are put in place. realcheck: .PHONY @if [ ! -x ${KYUA} ]; then \ echo; \ echo "kyua binary not installed at expected location (${.TARGET})"; \ echo; \ echo "Please install via pkg install, or specify the path to the kyua"; \ echo "package via the \$${LOCALBASE} variable, e.g. "; \ echo "LOCALBASE=\"${LOCALBASE}\""; \ false; \ fi @${KYUA} test -k ${CHECKDIR}/Kyuafile