diff options
| author | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2020-10-06 06:45:52 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2020-10-06 06:45:52 +0000 |
| commit | 194d5628721f6a306aa94f7e33be909f1ab16b49 (patch) | |
| tree | eba47dc2fe831cfb837e39be6b194bc7d33c4944 /share/mk | |
| parent | 7862a433e947a78b44bce80bb7e00eeb44d752cd (diff) | |
| download | src-test2-194d5628721f6a306aa94f7e33be909f1ab16b49.tar.gz src-test2-194d5628721f6a306aa94f7e33be909f1ab16b49.zip | |
Notes
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.test.mk | 3 | ||||
| -rw-r--r-- | share/mk/googletest.test.mk | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk index 072c5612ae29..588cfbcb45ed 100644 --- a/share/mk/bsd.test.mk +++ b/share/mk/bsd.test.mk @@ -62,10 +62,11 @@ TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g} _TESTS= # Pull in the definitions of all supported test interfaces. -.include <atf.test.mk> .include <googletest.test.mk> .include <plain.test.mk> .include <tap.test.mk> +# Include atf last to let other test framework use it +.include <atf.test.mk> # Sort the tests alphabetically, so the results are deterministically formed # across runs. diff --git a/share/mk/googletest.test.mk b/share/mk/googletest.test.mk index b55f28d572f0..b2e57e8d6e0a 100644 --- a/share/mk/googletest.test.mk +++ b/share/mk/googletest.test.mk @@ -30,12 +30,18 @@ GTESTS?= .include <googletest.test.inc.mk> PROGS_CXX+= ${GTESTS} -_TESTS+= ${GTESTS} .for _T in ${GTESTS} BINDIR.${_T}= ${TESTSDIR} CXXFLAGS.${_T}+= ${GTESTS_CXXFLAGS} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}.cc +.if !empty(GTESTS_WRAPPER_SH.${_T}) +# A stopgap/workaround to let kyua execute test case one by one +ATF_TESTS_SH+= ${GTESTS_WRAPPER_SH.${_T}} +.else +_TESTS+= ${_T} TEST_INTERFACE.${_T}= plain +.endif + .endfor .endif |