svn commit: r290921 - in user/ngie/more-tests2: . share/mk
Garrett Cooper
ngie at FreeBSD.org
Mon Nov 16 06:52:13 UTC 2015
Author: ngie
Date: Mon Nov 16 06:52:11 2015
New Revision: 290921
URL: https://svnweb.freebsd.org/changeset/base/290921
Log:
Convert `make regress` to `make check`
`make check` is the shorter, and is more standard than `make regress` or `make test`
Modified:
user/ngie/more-tests2/Makefile
user/ngie/more-tests2/share/mk/atf.test.mk
user/ngie/more-tests2/share/mk/bsd.README
user/ngie/more-tests2/share/mk/bsd.subdir.mk
user/ngie/more-tests2/share/mk/bsd.sys.mk
user/ngie/more-tests2/share/mk/bsd.test.mk
user/ngie/more-tests2/share/mk/suite.test.mk
Modified: user/ngie/more-tests2/Makefile
==============================================================================
--- user/ngie/more-tests2/Makefile Mon Nov 16 06:26:26 2015 (r290920)
+++ user/ngie/more-tests2/Makefile Mon Nov 16 06:52:11 2015 (r290921)
@@ -112,7 +112,7 @@
.else
TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
- check-old check-old-dirs check-old-files check-old-libs \
+ check check-old check-old-dirs check-old-files check-old-libs \
checkdpadd clean cleandepend cleandir cleanworld \
delete-old delete-old-dirs delete-old-files delete-old-libs \
depend distribute distributekernel distributekernel.debug \
@@ -121,7 +121,7 @@ TGTS= all all-man buildenv buildenvvars
installkernel.debug packagekernel packageworld \
reinstallkernel reinstallkernel.debug \
installworld kernel-toolchain libraries lint maninstall \
- obj objlink regress rerelease showconfig tags toolchain update \
+ obj objlink rerelease showconfig tags toolchain update \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
Modified: user/ngie/more-tests2/share/mk/atf.test.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/atf.test.mk Mon Nov 16 06:26:26 2015 (r290920)
+++ user/ngie/more-tests2/share/mk/atf.test.mk Mon Nov 16 06:52:11 2015 (r290921)
@@ -25,7 +25,7 @@ ATF_TESTS_SH?=
# Path to the prefix of the installed ATF tools, if any.
#
# If atf-run and atf-report are installed from ports, we automatically define a
-# realregress target below to run the tests using these tools. The tools are
+# realcheck target below to run the tests using these tools. The tools are
# searched for in the hierarchy specified by this variable.
ATF_PREFIX?= /usr/local
Modified: user/ngie/more-tests2/share/mk/bsd.README
==============================================================================
--- user/ngie/more-tests2/share/mk/bsd.README Mon Nov 16 06:26:26 2015 (r290920)
+++ user/ngie/more-tests2/share/mk/bsd.README Mon Nov 16 06:52:11 2015 (r290921)
@@ -448,6 +448,12 @@ It has seven targets:
all:
build the test programs.
+ check:
+ runs the test programs from the object directory; if the
+ Makefile does not itself define the target test, the
+ targets beforecheck and aftercheck may also be used to
+ cause actions immediately before and after the test
+ target is executed.
clean:
remove the test programs and any object files.
cleandir:
@@ -464,12 +470,6 @@ It has seven targets:
install target is executed.
lint:
run lint on the source files.
- regress:
- runs the test programs from the object directory; if the
- Makefile does not itself define the target test, the
- targets beforeregress and afterregress may also be used to
- cause actions immediately before and after the test
- target is executed.
tags:
create a tags file for the source files.
Modified: user/ngie/more-tests2/share/mk/bsd.subdir.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/bsd.subdir.mk Mon Nov 16 06:26:26 2015 (r290920)
+++ user/ngie/more-tests2/share/mk/bsd.subdir.mk Mon Nov 16 06:52:11 2015 (r290921)
@@ -36,10 +36,10 @@
.if !target(__<bsd.subdir.mk>__)
__<bsd.subdir.mk>__:
-ALL_SUBDIR_TARGETS= all all-man buildconfig checkdpadd clean cleandepend \
+ALL_SUBDIR_TARGETS= all all-man buildconfig check checkdpadd clean cleandepend \
cleandir cleanilinks cleanobj depend distribute \
installconfig lint maninstall manlint obj objlink \
- realinstall regress tags \
+ realinstall tags \
${SUBDIR_TARGETS}
# Described above.
Modified: user/ngie/more-tests2/share/mk/bsd.sys.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/bsd.sys.mk Mon Nov 16 06:26:26 2015 (r290920)
+++ user/ngie/more-tests2/share/mk/bsd.sys.mk Mon Nov 16 06:52:11 2015 (r290921)
@@ -172,11 +172,11 @@ CXXFLAGS+= ${CXXFLAGS.${COMPILER_TYPE}}
# or expect to ever be up-to-date.
PHONY_NOTMAIN = afterdepend afterinstall all beforedepend beforeinstall \
beforelinking build build-tools buildconfig buildfiles \
- buildincludes checkdpadd clean cleandepend cleandir cleanobj \
- configure depend dependall distclean distribute exe \
+ buildincludes check checkdpadd clean cleandepend cleandir \
+ cleanobj configure depend dependall distclean distribute exe \
files html includes install installconfig installfiles \
installincludes lint obj objlink objs objwarn realall \
- realdepend realinstall regress subdir-all subdir-depend \
+ realdepend realinstall subdir-all subdir-depend \
subdir-install tags whereobj
# we don't want ${PROG} to be PHONY
Modified: user/ngie/more-tests2/share/mk/bsd.test.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/bsd.test.mk Mon Nov 16 06:26:26 2015 (r290920)
+++ user/ngie/more-tests2/share/mk/bsd.test.mk Mon Nov 16 06:52:11 2015 (r290921)
@@ -76,14 +76,14 @@ PROGS_TARGETS+= install
.include <suite.test.mk>
.endif
-.if !target(realregress)
-realregress: .PHONY
+.if !target(realcheck)
+realcheck: .PHONY
@echo "$@ not defined; skipping"
.endif
-beforeregress realregress afterregress regress: .PHONY
-.ORDER: beforeregress realregress afterregress
-regress: beforeregress realregress afterregress
+beforecheck realcheck aftercheck check: .PHONY
+.ORDER: beforecheck realcheck aftercheck
+check: beforecheck realcheck aftercheck
.ifdef PROG
# we came here via bsd.progs.mk below
Modified: user/ngie/more-tests2/share/mk/suite.test.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/suite.test.mk Mon Nov 16 06:26:26 2015 (r290920)
+++ user/ngie/more-tests2/share/mk/suite.test.mk Mon Nov 16 06:52:11 2015 (r290921)
@@ -51,7 +51,7 @@ KYUAFILE?= auto
# Path to the prefix of the installed Kyua CLI, if any.
#
-# If kyua is installed from ports, we automatically define a realregress target
+# If kyua is installed from ports, we automatically define a realcheck target
# below to run the tests using this tool. The tools are searched for in the
# hierarchy specified by this variable.
KYUA_PREFIX?= /usr/local
@@ -96,9 +96,9 @@ _kyuafile= ${DESTDIR}${TESTSDIR}/Kyuafil
KYUA?= ${KYUA_PREFIX}/bin/kyua
-realregress: .PHONY
+realcheck: .PHONY
.if exists(${KYUA})
-# Definition of the "make regress" target and supporting variables.
+# Definition of the "make check" 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
More information about the svn-src-user
mailing list