From owner-svn-src-user@freebsd.org Sun Dec 20 06:13:19 2015 Return-Path: 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 EB87BA4049A for ; Sun, 20 Dec 2015 06:13:19 +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 9F3651842; Sun, 20 Dec 2015 06:13:19 +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 tBK6DI9i013052; Sun, 20 Dec 2015 06:13:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBK6DIk6013049; Sun, 20 Dec 2015 06:13:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512200613.tBK6DIk6013049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 20 Dec 2015 06:13:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292506 - in user/ngie/make_check: . share/man/man7 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2015 06:13:20 -0000 Author: ngie Date: Sun Dec 20 06:13:18 2015 New Revision: 292506 URL: https://svnweb.freebsd.org/changeset/base/292506 Log: Apply feedback from emaste Modified: user/ngie/make_check/Makefile user/ngie/make_check/share/man/man7/build.7 user/ngie/make_check/share/mk/suite.test.mk Modified: user/ngie/make_check/Makefile ============================================================================== --- user/ngie/make_check/Makefile Sun Dec 20 06:03:59 2015 (r292505) +++ user/ngie/make_check/Makefile Sun Dec 20 06:13:18 2015 (r292506) @@ -329,6 +329,10 @@ bmake: .PHONY ${MMAKE} all; \ ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= +regress: .PHONY + @echo "'make regress' has been renamed 'make check'" | /usr/bin/fmt + @false + tinderbox toolchains kernel-toolchains: upgrade_checks tinderbox: Modified: user/ngie/make_check/share/man/man7/build.7 ============================================================================== --- user/ngie/make_check/share/man/man7/build.7 Sun Dec 20 06:03:59 2015 (r292505) +++ user/ngie/make_check/share/man/man7/build.7 Sun Dec 20 06:13:18 2015 (r292506) @@ -116,7 +116,7 @@ but the check directory can be changed w .It Cm checkworld Run the .Fx -Test Suite on installed world. +test suite on installed world. .It Cm clean Remove any files created during the build process. .It Cm cleandepend Modified: user/ngie/make_check/share/mk/suite.test.mk ============================================================================== --- user/ngie/make_check/share/mk/suite.test.mk Sun Dec 20 06:03:59 2015 (r292505) +++ user/ngie/make_check/share/mk/suite.test.mk Sun Dec 20 06:13:18 2015 (r292506) @@ -78,14 +78,6 @@ Kyuafile: Makefile CHECKDIR?= ${DESTDIR}${TESTSDIR} KYUA= ${LOCALBASE}/bin/kyua -${KYUA}: - @echo - @echo "kyua binary not installed at expected location (${.TARGET})" - @echo - @echo "Please install via pkg install, or specify the path to the kyua" - @echo "package via the \$${LOCALBASE} variable, e.g. " - @echo "LOCALBASE=\"${LOCALBASE}\"" - @false # Definition of the "make check" target and supporting variables. # @@ -98,5 +90,13 @@ ${KYUA}: # report bogus results unless the new binaries are put in place. realcheck: .PHONY -realcheck: ${KYUA} + @if [ ! -x ${KYUA} ]; then \ + echo; \ + echo "kyua binary not installed at expected location (${.TARGET})"; \ + echo; \ + echo "Please install via pkg install, or specify the path to the kyua"; \ + echo "package via the \$${LOCALBASE} variable, e.g. "; \ + echo "LOCALBASE=\"${LOCALBASE}\""; \ + false; \ + fi @${KYUA} test -k ${CHECKDIR}/Kyuafile