From owner-svn-src-user@freebsd.org  Sun Dec  6 07:14:33 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC5B7A3BFAC
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sun,  6 Dec 2015 07:14:33 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9A0D21ABD;
 Sun,  6 Dec 2015 07:14:33 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB67EW79087174;
 Sun, 6 Dec 2015 07:14:32 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB67EWKc087170;
 Sun, 6 Dec 2015 07:14:32 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512060714.tB67EWKc087170@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 6 Dec 2015 07:14:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r291894 - user/ngie/make_check/share/mk
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Dec 2015 07:14:34 -0000

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}