From owner-svn-src-projects@freebsd.org Wed Aug 2 22:01:08 2017 Return-Path: Delivered-To: svn-src-projects@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 3AE43DB62F6 for ; Wed, 2 Aug 2017 22:01:08 +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 16D697DFBF; Wed, 2 Aug 2017 22:01:08 +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 v72M17VA058519; Wed, 2 Aug 2017 22:01:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v72M17Sp058515; Wed, 2 Aug 2017 22:01:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201708022201.v72M17Sp058515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 2 Aug 2017 22:01:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321956 - projects/make-check-sandbox/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/make-check-sandbox/share/mk X-SVN-Commit-Revision: 321956 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2017 22:01:08 -0000 Author: ngie Date: Wed Aug 2 22:01:06 2017 New Revision: 321956 URL: https://svnweb.freebsd.org/changeset/base/321956 Log: Expose _TESTS_USE_OBJDIR as MK_MAKE_CHECK_USE_SANDBOX and anchor the default value on MK_TESTS. Use bsd.opts.mk in suite.test.mk to toggle the behavior. Modified: projects/make-check-sandbox/share/mk/bsd.lib.mk projects/make-check-sandbox/share/mk/bsd.opts.mk projects/make-check-sandbox/share/mk/bsd.prog.mk projects/make-check-sandbox/share/mk/suite.test.mk Modified: projects/make-check-sandbox/share/mk/bsd.lib.mk ============================================================================== --- projects/make-check-sandbox/share/mk/bsd.lib.mk Wed Aug 2 21:52:59 2017 (r321955) +++ projects/make-check-sandbox/share/mk/bsd.lib.mk Wed Aug 2 22:01:06 2017 (r321956) @@ -443,7 +443,7 @@ OBJS_DEPEND_GUESS.${_S:R}.pico+= ${_S} .endif .if defined(HAS_TESTS) -MAKE+= -D_TESTS_USE_OBJDIR +MAKE+= MK_MAKE_CHECK_USE_SANDBOX=yes SUBDIR_TARGETS+= check TESTS_LD_LIBRARY_PATH+= ${.OBJDIR} .endif Modified: projects/make-check-sandbox/share/mk/bsd.opts.mk ============================================================================== --- projects/make-check-sandbox/share/mk/bsd.opts.mk Wed Aug 2 21:52:59 2017 (r321955) +++ projects/make-check-sandbox/share/mk/bsd.opts.mk Wed Aug 2 22:01:06 2017 (r321956) @@ -55,6 +55,7 @@ __DEFAULT_YES_OPTIONS = \ INCLUDES \ INSTALLLIB \ KERBEROS \ + MAKE_CHECK_USE_SANDBOX \ MAN \ MANCOMPRESS \ NIS \ @@ -75,6 +76,7 @@ __DEFAULT_NO_OPTIONS = \ # meta mode related __DEFAULT_DEPENDENT_OPTIONS = \ + MAKE_CHECK_USE_SANDBOX/TESTS STAGING_MAN/STAGING \ STAGING_PROG/STAGING \ STALE_STAGED/STAGING \ Modified: projects/make-check-sandbox/share/mk/bsd.prog.mk ============================================================================== --- projects/make-check-sandbox/share/mk/bsd.prog.mk Wed Aug 2 21:52:59 2017 (r321955) +++ projects/make-check-sandbox/share/mk/bsd.prog.mk Wed Aug 2 22:01:06 2017 (r321956) @@ -306,7 +306,7 @@ lint: ${SRCS:M*.c} .endif .if defined(HAS_TESTS) -MAKE+= -D_TESTS_USE_OBJDIR +MAKE+= MK_MAKE_CHECK_USE_SANDBOX=yes SUBDIR_TARGETS+= check TESTS_LD_LIBRARY_PATH+= ${.OBJDIR} TESTS_PATH+= ${.OBJDIR} Modified: projects/make-check-sandbox/share/mk/suite.test.mk ============================================================================== --- projects/make-check-sandbox/share/mk/suite.test.mk Wed Aug 2 21:52:59 2017 (r321955) +++ projects/make-check-sandbox/share/mk/suite.test.mk Wed Aug 2 22:01:06 2017 (r321956) @@ -8,6 +8,8 @@ .error suite.test.mk cannot be included directly. .endif +.include + # Name of the test suite these tests belong to. Should rarely be changed for # Makefiles built into the FreeBSD src tree. TESTSUITE?= FreeBSD @@ -101,7 +103,7 @@ realcheck: .PHONY fi @env ${TESTS_ENV:Q} ${KYUA} test -k ${CHECKDIR}/Kyuafile -.if defined(_TESTS_USE_OBJDIR) && make(check) +.if ${MK_MAKE_CHECK_USE_SANDBOX} && make(check) DESTDIR:= ${.OBJDIR}/checkdir CLEANDIRS+= ${DESTDIR}