From owner-svn-src-projects@freebsd.org Thu Aug 3 17:42:15 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 4015EDCA61A for ; Thu, 3 Aug 2017 17:42:15 +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 094FE6422C; Thu, 3 Aug 2017 17:42:14 +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 v73HgE2p051615; Thu, 3 Aug 2017 17:42:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v73HgE8a051614; Thu, 3 Aug 2017 17:42:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201708031742.v73HgE8a051614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 3 Aug 2017 17:42:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322021 - 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: 322021 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: Thu, 03 Aug 2017 17:42:15 -0000 Author: ngie Date: Thu Aug 3 17:42:13 2017 New Revision: 322021 URL: https://svnweb.freebsd.org/changeset/base/322021 Log: Always expose DESTDIR as MAKE_CHECK_SANDBOX_DIR and always add it to CLEANDIRS This removes a need for passing CLEANDIRS in to "make clean" in a slightly convoluted way. Also, remove the ${MAKE_CHECK_SANDBOX_DIR} is already present -> bail logic. It was incredibly annoying dealing with false positives/failures (of which there are a handful in the tree with tests). It's better to just assume that the user is smart enough to do the right thing and not invoke "make check" (sandboxed) multiple times, keeping ${MAKE_CHECK_SANDBOX_DIR}. Modified: projects/make-check-sandbox/share/mk/suite.test.mk Modified: projects/make-check-sandbox/share/mk/suite.test.mk ============================================================================== --- projects/make-check-sandbox/share/mk/suite.test.mk Thu Aug 3 17:33:59 2017 (r322020) +++ projects/make-check-sandbox/share/mk/suite.test.mk Thu Aug 3 17:42:13 2017 (r322021) @@ -103,18 +103,13 @@ realcheck: .PHONY fi @env ${TESTS_ENV:Q} ${KYUA} test -k ${CHECKDIR}/Kyuafile +MAKE_CHECK_SANDBOX_DIR= ${.OBJDIR}/checkdir +CLEANDIRS+= ${MAKE_CHECK_SANDBOX_DIR} + .if ${MK_MAKE_CHECK_USE_SANDBOX} != "no" && make(check) -DESTDIR:= ${.OBJDIR}/checkdir -CLEANDIRS+= ${DESTDIR} +DESTDIR:= ${MAKE_CHECK_SANDBOX_DIR} -# XXX (ngie): use daemon(1) and a pidfile to lock the directory? beforecheck: - @if [ -d "${DESTDIR}" ]; then \ - echo "${DESTDIR} already exists"; \ - echo "Aborting to avoid false positives with potentially" \ - "parallel instances of '${MAKE} check'"; \ - false; \ - fi .for t in clean all @cd ${.CURDIR} && ${MAKE} $t .endfor