svn commit: r291894 - user/ngie/make_check/share/mk

[Garrett Cooper]

Author: ngie
Date: Sun Dec  6 07:14:32 2015
New Revision: 291894
URL: https://svnweb.freebsd.org/changeset/base/291894

Log:
  Move LOCALBASE definition to bsd.test.mk and use LOCALBASE when
  defining TAP_PERL_INTERPRETER in tap.test.mk

Modified:
  user/ngie/make_check/share/mk/bsd.test.mk
  user/ngie/make_check/share/mk/suite.test.mk
  user/ngie/make_check/share/mk/tap.test.mk

Modified: user/ngie/make_check/share/mk/bsd.test.mk
==============================================================================
--- user/ngie/make_check/share/mk/bsd.test.mk	Sun Dec  6 07:02:06 2015	(r291893)
+++ user/ngie/make_check/share/mk/bsd.test.mk	Sun Dec  6 07:14:32 2015	(r291894)
@@ -10,6 +10,9 @@
 
 __<bsd.test.mk>__:
 
+# Path to the prefix of the ATF and Kyua CLI.
+LOCALBASE?=	/usr/local
+
 # Tests install directory
 TESTSDIR?=	${TESTSBASE}/${RELDIR:H}
 

Modified: user/ngie/make_check/share/mk/suite.test.mk
==============================================================================
--- user/ngie/make_check/share/mk/suite.test.mk	Sun Dec  6 07:02:06 2015	(r291893)
+++ user/ngie/make_check/share/mk/suite.test.mk	Sun Dec  6 07:14:32 2015	(r291894)
@@ -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 realcheck target
-# below to run the tests using this tool.  The tools are searched for in the
-# hierarchy specified by this variable.
-LOCALBASE?=	/usr/local
-
 .if ${KYUAFILE:tl} != "no"
 FILES+=	Kyuafile
 FILESDIR_Kyuafile= ${TESTSDIR}

Modified: user/ngie/make_check/share/mk/tap.test.mk
==============================================================================
--- user/ngie/make_check/share/mk/tap.test.mk	Sun Dec  6 07:02:06 2015	(r291893)
+++ user/ngie/make_check/share/mk/tap.test.mk	Sun Dec  6 07:14:32 2015	(r291894)
@@ -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}