Date: Sun, 20 Dec 2015 06:26:15 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292507 - head/share/mk Message-ID: <201512200626.tBK6QFCN016101@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Dec 20 06:26:15 2015 New Revision: 292507 URL: https://svnweb.freebsd.org/changeset/base/292507 Log: - 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 Modified: head/share/mk/bsd.test.mk head/share/mk/suite.test.mk head/share/mk/tap.test.mk Modified: head/share/mk/bsd.test.mk ============================================================================== --- head/share/mk/bsd.test.mk Sun Dec 20 06:13:18 2015 (r292506) +++ head/share/mk/bsd.test.mk Sun Dec 20 06:26:15 2015 (r292507) @@ -10,6 +10,9 @@ __<bsd.test.mk>__: +# Third-party software (kyua, etc) prefix. +LOCALBASE?= /usr/local + # Tests install directory TESTSDIR?= ${TESTSBASE}/${RELDIR:H} Modified: head/share/mk/suite.test.mk ============================================================================== --- head/share/mk/suite.test.mk Sun Dec 20 06:13:18 2015 (r292506) +++ head/share/mk/suite.test.mk Sun Dec 20 06:26:15 2015 (r292507) @@ -45,13 +45,6 @@ KYUAFILE?= auto # unqualified TEST_METADATA variable. #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} @@ -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. # Modified: head/share/mk/tap.test.mk ============================================================================== --- head/share/mk/tap.test.mk Sun Dec 20 06:13:18 2015 (r292506) +++ head/share/mk/tap.test.mk Sun Dec 20 06:26:15 2015 (r292507) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512200626.tBK6QFCN016101>