diff options
| author | ngie <ngie@FreeBSD.org> | 2015-12-28 00:05:31 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-12-28 00:05:31 +0000 |
| commit | a2034803c3289c1600ea2ec5fa2e9dbed47bdc62 (patch) | |
| tree | 04e51e01dce4891890907c2b362460fb46d9a52e /share/mk | |
| parent | 9890a61c16673af4778b628644b81a6d9ad64c72 (diff) | |
| download | FreeBSD-src-a2034803c3289c1600ea2ec5fa2e9dbed47bdc62.zip FreeBSD-src-a2034803c3289c1600ea2ec5fa2e9dbed47bdc62.tar.gz | |
MFC r292507,r292508:
r292507:
- Use LOCALBASE instead of KYUA_PREFIX for the --prefix to kyua(1)
- Use LOCALBASE instead of hardcoding /usr/local for perl
Differential Revision: https://reviews.freebsd.org/D4406 (part of a larger diff)
Reviewed by: emaste, Evan Cramer <eccramer@gmail.com>
Sponsored by: EMC / Isilon Storage Division
r292508:
Document LOCALBASE in the bsd.test.mk section
Differential Revision: https://reviews.freebsd.org/D4406 (part of a larger diff)
Reviewed by: emaste, Evan Cramer <eccramer@gmail.com>
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.README | 4 | ||||
| -rw-r--r-- | share/mk/bsd.test.mk | 3 | ||||
| -rw-r--r-- | share/mk/suite.test.mk | 9 | ||||
| -rw-r--r-- | share/mk/tap.test.mk | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 179bcba..89f5f7e 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -442,6 +442,10 @@ KYUAFILE If 'auto' (the default), generate a Kyuafile out of the subdirectories providing helper programs or data files only). +LOCALBASE The --prefix for the kyua package. + + The value of LOCALBASE defaults to /usr/local . + ATF_TESTS_C The names of the ATF C test programs to build. ATF_TESTS_CXX The names of the ATF C++ test programs to build. diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk index 6f20d3d..3d57506 100644 --- a/share/mk/bsd.test.mk +++ b/share/mk/bsd.test.mk @@ -10,6 +10,9 @@ __<bsd.test.mk>__: +# 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 10bca7a..0d48950 100644 --- a/share/mk/suite.test.mk +++ b/share/mk/suite.test.mk @@ -38,13 +38,6 @@ KYUAFILE?= auto # Makefile to rely on the KYUAFILE=auto behavior defined here. #TEST_METADATA.<test-program>+= 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} @@ -79,7 +72,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 ec86088..28b52af 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} |
