diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk index 86351cff3c6..9c596197208 100644 --- a/share/mk/bsd.test.mk +++ b/share/mk/bsd.test.mk @@ -10,6 +10,9 @@ ____: +# Third-party software (kyua, etc) prefix. +LOCALBASE?= /usr/local + # Tests install directory TESTSDIR?= ${TESTSBASE}/${RELDIR:H} diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk index 26f1494d36f..451762adb99 100644 --- a/share/mk/suite.test.mk +++ b/share/mk/suite.test.mk @@ -45,13 +45,6 @@ KYUAFILE?= auto # unqualified TEST_METADATA variable. #TEST_METADATA.+= key="value" -# Path to the prefix of the installed Kyua CLI, if any. -# -# If kyua is installed from ports, we automatically define a realtest target -# below to run the tests using this tool. The tools are searched for in the -# hierarchy specified by this variable. -KYUA_PREFIX?= /usr/local - .if ${KYUAFILE:tl} != "no" FILES+= Kyuafile FILESDIR_Kyuafile= ${TESTSDIR} @@ -85,7 +78,7 @@ Kyuafile: Makefile @mv ${.TARGET}.tmp ${.TARGET} .endif -KYUA?= ${KYUA_PREFIX}/bin/kyua +KYUA= ${LOCALBASE}/bin/kyua .if exists(${KYUA}) # Definition of the "make test" target and supporting variables. # diff --git a/share/mk/tap.test.mk b/share/mk/tap.test.mk index ec860882f15..28b52af12bb 100644 --- a/share/mk/tap.test.mk +++ b/share/mk/tap.test.mk @@ -26,7 +26,7 @@ TAP_TESTS_PERL?= TAP_TESTS_SH?= # Perl interpreter to use for test programs written in this language. -TAP_PERL_INTERPRETER?= /usr/local/bin/perl +TAP_PERL_INTERPRETER?= ${LOCALBASE}/bin/perl .if !empty(TAP_TESTS_C) PROGS+= ${TAP_TESTS_C}