From owner-svn-src-user@FreeBSD.ORG Sun Apr 12 22:44:48 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66700E95; Sun, 12 Apr 2015 22:44:48 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37B111E6; Sun, 12 Apr 2015 22:44:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3CMim5t062592; Sun, 12 Apr 2015 22:44:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3CMil3A062591; Sun, 12 Apr 2015 22:44:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504122244.t3CMil3A062591@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 12 Apr 2015 22:44:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281476 - user/ngie/more-tests/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.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Apr 2015 22:44:48 -0000 Author: ngie Date: Sun Apr 12 22:44:47 2015 New Revision: 281476 URL: https://svnweb.freebsd.org/changeset/base/281476 Log: Put kyuafile-check in beforetest so the target isn't evaluated when iterating through subdirs (like bin/), thus causing the build to fail Modified: user/ngie/more-tests/share/mk/suite.test.mk Modified: user/ngie/more-tests/share/mk/suite.test.mk ============================================================================== --- user/ngie/more-tests/share/mk/suite.test.mk Sun Apr 12 22:40:27 2015 (r281475) +++ user/ngie/more-tests/share/mk/suite.test.mk Sun Apr 12 22:44:47 2015 (r281476) @@ -85,7 +85,26 @@ KYUA?= ${KYUA_PREFIX}/bin/kyua _kyuafile= ${DESTDIR}${TESTSDIR}/Kyuafile -kyuafile-check: +realtest: .PHONY +.if exists(${KYUA}) +# Definition of the "make test" target and supporting variables. +# +# This target, by necessity, can only work for native builds (i.e. a FreeBSD +# host building a release for the same system). The target runs Kyua, which is +# not in the toolchain, and the tests execute code built for the target host. +# +# Due to the dependencies of the binaries built by the source tree and how they +# are used by tests, it is highly possible for a execution of "make test" to +# report bogus results unless the new binaries are put in place. +realtest: + @${KYUA} test -k ${_kyuafile} +.endif + +beforetest: .PHONY +.if !defined(TESTSDIR) + @echo "*** No TESTSDIR defined; nothing to do." + @false +.endif .if ${KYUAFILE:tl} != "no" @if [ ! -f ${_kyuafile} ]; then \ echo "*** Please run make install and make test for" \ @@ -104,24 +123,3 @@ kyuafile-check: false; \ fi .endif - -.if exists(${KYUA}) -# Definition of the "make test" target and supporting variables. -# -# This target, by necessity, can only work for native builds (i.e. a FreeBSD -# host building a release for the same system). The target runs Kyua, which is -# not in the toolchain, and the tests execute code built for the target host. -# -# Due to the dependencies of the binaries built by the source tree and how they -# are used by tests, it is highly possible for a execution of "make test" to -# report bogus results unless the new binaries are put in place. -realtest: .PHONY - ${KYUA} test -k ${_kyuafile} -.endif - -beforetest: .PHONY -beforetest: kyuafile-check -.if !defined(TESTSDIR) - @echo "*** No TESTSDIR defined; nothing to do." - @false -.endif