[src/trunk]: src/usr.bin/make/unit-tests tests/make: suppress -DCLEANUP outpu...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f6ae6c7d154b
branches:  trunk
changeset: 364452:f6ae6c7d154b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Mar 25 22:38:39 2022 +0000

description:
tests/make: suppress -DCLEANUP output in test deptgt-phony

diffstat:

 usr.bin/make/unit-tests/Makefile |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 9ae8f2860589 -r f6ae6c7d154b usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Fri Mar 25 21:24:20 2022 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Fri Mar 25 22:38:39 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.309 2022/02/12 13:17:57 rillig Exp $
+# $NetBSD: Makefile,v 1.310 2022/03/25 22:38:39 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -485,9 +485,8 @@
 FLAGS.varname-empty=           -dv '$${:U}=cmdline-u' '=cmdline-plain'
 
 # Some tests need extra postprocessing.
-SED_CMDS.dir=          ${:D remove output from -DCLEANUP mode }
-SED_CMDS.dir+=         -e '/^OpenDirs_Done:/d'
-SED_CMDS.dir+=         -e '/^CachedDir /d'
+SED_CMDS.deptgt-phony= ${STD_SED_CMDS.dd}
+SED_CMDS.dir=          ${STD_SED_CMDS.dd}
 SED_CMDS.export=       -e '/^[^=_A-Za-z0-9]*=/d'
 SED_CMDS.export-all=   ${SED_CMDS.export}
 SED_CMDS.export-env=   ${SED_CMDS.export}
@@ -552,6 +551,11 @@
 
 # Some standard sed commands, to be used in the SED_CMDS above.
 
+# In tests that use the debugging option -dd, ignore debugging output that is
+# only logged in -DCLEANUP mode.
+STD_SED_CMDS.dd=               -e '/^OpenDirs_Done:/d'
+STD_SED_CMDS.dd+=              -e '/^CachedDir /d'
+
 # Omit details such as process IDs from the output of the -dg1 option.
 STD_SED_CMDS.dg1=      -e 's,${.CURDIR}$$,<curdir>,'
 STD_SED_CMDS.dg1+=     -e 's,  ${DEFSYSPATH:U/usr/share/mk}$$,  <defsyspath>,'