Module Name: src
Committed By: rillig
Date: Sun Aug 16 18:04:33 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
make(1): use consistent formatting for running the tests
With the many newly added tests, having two messages ("testing xzy" and
"postprocessing xyz") made the output too noisy since the words were not
aligned nicely. Use the same formatting as for MAKEVERBOSE=0, and
remove the message for postprocessing. If there should ever be problems
during postprocessing, it's trivial to run "../make TESTS=bad-test -dl"
to find out where the problem is.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/usr.bin/make/unit-tests/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.95 src/usr.bin/make/unit-tests/Makefile:1.96
--- src/usr.bin/make/unit-tests/Makefile:1.95 Sun Aug 16 17:58:48 2020
+++ src/usr.bin/make/unit-tests/Makefile Sun Aug 16 18:04:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2020/08/16 17:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.96 2020/08/16 18:04:33 rillig Exp $
#
# Unit tests for make(1)
#
@@ -365,7 +365,7 @@ LANG= C
# the tests are actually done with sub-makes.
.SUFFIXES: .mk .rawout .out
.mk.rawout:
- @echo testing ${.IMPSRC}
+ @${_MKMSG_TEST:Uecho '# test '} ${.PREFIX}
@set -eu; \
cd ${.OBJDIR}; \
env ${ENV.${.TARGET:R}} ${TEST_MAKE} -C ${.CURDIR} \
@@ -387,7 +387,6 @@ _SED_CMDS+= -e 's,${.CURDIR:S,.,\\.,g}/,
_SED_CMDS+= -e 's,${UNIT_TESTS:S,.,\\.,g}/,,g'
.rawout.out:
- @echo postprocess ${.TARGET}
@${TOOL_SED} ${_SED_CMDS} ${SED_CMDS.${.TARGET:R}} \
< ${.IMPSRC} > ${.TARGET}.tmp1
@${POSTPROC.${.TARGET:R}:Ucat} < ${.TARGET}.tmp1 > ${.TARGET}.tmp2
