Date: Sun, 20 Dec 2015 06:13:18 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292506 - in user/ngie/make_check: . share/man/man7 share/mk Message-ID: <201512200613.tBK6DIk6013049@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512200613.tBK6DIk6013049>