From owner-svn-src-head@FreeBSD.ORG Fri Oct 25 05:12:32 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 987A7AB6; Fri, 25 Oct 2013 05:12:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 867E02B94; Fri, 25 Oct 2013 05:12:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9P5CWD6003742; Fri, 25 Oct 2013 05:12:32 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9P5CWXG003740; Fri, 25 Oct 2013 05:12:32 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201310250512.r9P5CWXG003740@svn.freebsd.org> From: Rui Paulo Date: Fri, 25 Oct 2013 05:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257096 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Oct 2013 05:12:32 -0000 Author: rpaulo Date: Fri Oct 25 05:12:31 2013 New Revision: 257096 URL: http://svnweb.freebsd.org/changeset/base/257096 Log: Move the TESTSBASE definition to bsd.own.mk. We need to be able to reference the value of TESTSBASE without requiring the inclusion of bsd.test.mk (e.g. in etc/Makefile), so move its definition to the more generic bsd.own.mk. Submitted by: Julio Merino jmmv google.com Reviewed by: sjg MFC after: 2 weeks Modified: head/share/mk/bsd.own.mk head/share/mk/bsd.test.mk Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Fri Oct 25 05:11:10 2013 (r257095) +++ head/share/mk/bsd.own.mk Fri Oct 25 05:12:31 2013 (r257096) @@ -664,4 +664,8 @@ $xGRP= ${_gid} .endif # !_WITHOUT_SRCCONF +# Pointer to the top directory into which tests are installed. Should not be +# overriden by Makefiles, but the user may choose to set this in src.conf(5). +TESTSBASE?= /usr/tests + .endif # !target(____) Modified: head/share/mk/bsd.test.mk ============================================================================== --- head/share/mk/bsd.test.mk Fri Oct 25 05:11:10 2013 (r257095) +++ head/share/mk/bsd.test.mk Fri Oct 25 05:12:31 2013 (r257096) @@ -12,10 +12,6 @@ .include -# Pointer to the top directory into which tests are installed. Should not be -# overriden by Makefiles, but the user may choose to set this in src.conf(5). -TESTSBASE?= /usr/tests - # Directory in which to install tests defined by the current Makefile. # Makefiles have to override this to point to a subdirectory of TESTSBASE. TESTSDIR?= .