- Use LOCALBASE instead of KYUA_PREFIX for the --prefix to kyua(1)
- Use LOCALBASE instead of hardcoding /usr/local for perl MFC after: 1 week 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
This commit is contained in:
@@ -10,6 +10,9 @@
|
|||||||
|
|
||||||
__<bsd.test.mk>__:
|
__<bsd.test.mk>__:
|
||||||
|
|
||||||
|
# Third-party software (kyua, etc) prefix.
|
||||||
|
LOCALBASE?= /usr/local
|
||||||
|
|
||||||
# Tests install directory
|
# Tests install directory
|
||||||
TESTSDIR?= ${TESTSBASE}/${RELDIR:H}
|
TESTSDIR?= ${TESTSBASE}/${RELDIR:H}
|
||||||
|
|
||||||
|
|||||||
@@ -45,13 +45,6 @@ KYUAFILE?= auto
|
|||||||
# unqualified TEST_METADATA variable.
|
# unqualified TEST_METADATA variable.
|
||||||
#TEST_METADATA.<test-program>+= key="value"
|
#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"
|
.if ${KYUAFILE:tl} != "no"
|
||||||
FILES+= Kyuafile
|
FILES+= Kyuafile
|
||||||
FILESDIR_Kyuafile= ${TESTSDIR}
|
FILESDIR_Kyuafile= ${TESTSDIR}
|
||||||
@@ -85,7 +78,7 @@ Kyuafile: Makefile
|
|||||||
@mv ${.TARGET}.tmp ${.TARGET}
|
@mv ${.TARGET}.tmp ${.TARGET}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
KYUA?= ${KYUA_PREFIX}/bin/kyua
|
KYUA= ${LOCALBASE}/bin/kyua
|
||||||
.if exists(${KYUA})
|
.if exists(${KYUA})
|
||||||
# Definition of the "make test" target and supporting variables.
|
# Definition of the "make test" target and supporting variables.
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ TAP_TESTS_PERL?=
|
|||||||
TAP_TESTS_SH?=
|
TAP_TESTS_SH?=
|
||||||
|
|
||||||
# Perl interpreter to use for test programs written in this language.
|
# 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)
|
.if !empty(TAP_TESTS_C)
|
||||||
PROGS+= ${TAP_TESTS_C}
|
PROGS+= ${TAP_TESTS_C}
|
||||||
|
|||||||
Reference in New Issue
Block a user