svn commit: r292812 - stable/10/share/mk

[Garrett Cooper]

Author: ngie
Date: Mon Dec 28 00:05:31 2015
New Revision: 292812
URL: https://svnweb.freebsd.org/changeset/base/292812

Log:
  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 at 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 at gmail.com>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/share/mk/bsd.README
  stable/10/share/mk/bsd.test.mk
  stable/10/share/mk/suite.test.mk
  stable/10/share/mk/tap.test.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.README
==============================================================================
--- stable/10/share/mk/bsd.README	Sun Dec 27 23:25:21 2015	(r292811)
+++ stable/10/share/mk/bsd.README	Mon Dec 28 00:05:31 2015	(r292812)
@@ -442,6 +442,10 @@ KYUAFILE	If 'auto' (the default), genera
 		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.

Modified: stable/10/share/mk/bsd.test.mk
==============================================================================
--- stable/10/share/mk/bsd.test.mk	Sun Dec 27 23:25:21 2015	(r292811)
+++ stable/10/share/mk/bsd.test.mk	Mon Dec 28 00:05:31 2015	(r292812)
@@ -10,6 +10,9 @@
 
 __<bsd.test.mk>__:
 
+# Third-party software (kyua, etc) prefix.
+LOCALBASE?=	/usr/local
+
 # Tests install directory
 TESTSDIR?=	${TESTSBASE}/${RELDIR:H}
 

Modified: stable/10/share/mk/suite.test.mk
==============================================================================
--- stable/10/share/mk/suite.test.mk	Sun Dec 27 23:25:21 2015	(r292811)
+++ stable/10/share/mk/suite.test.mk	Mon Dec 28 00:05:31 2015	(r292812)
@@ -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.
 #

Modified: stable/10/share/mk/tap.test.mk
==============================================================================
--- stable/10/share/mk/tap.test.mk	Sun Dec 27 23:25:21 2015	(r292811)
+++ stable/10/share/mk/tap.test.mk	Mon Dec 28 00:05:31 2015	(r292812)
@@ -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}