Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests make(1): use consistent formatting f...



details:   https://anonhg.NetBSD.org/src/rev/c894f317b745
branches:  trunk
changeset: 1012951:c894f317b745
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Aug 16 18:04:33 2020 +0000

description:
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.

diffstat:

 usr.bin/make/unit-tests/Makefile |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 75088ce1bd55 -r c894f317b745 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Sun Aug 16 18:02:03 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Sun Aug 16 18:04:33 2020 +0000
@@ -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 @@
 # 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,${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



Home | Main Index | Thread Index | Old Index