[src/trunk]: src/usr.bin/make/unit-tests make(1): mark the output in test dir...

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

details:   https://anonhg.NetBSD.org/src/rev/a2dbfeace8d9
branches:  trunk
changeset: 945524:a2dbfeace8d9
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Oct 31 21:12:36 2020 +0000

description:
make(1): mark the output in test dir.mk with a prefix

This is needed to distinguish it from the debug log, which will be added
in the next commit.

diffstat:

 usr.bin/make/unit-tests/dir.exp |  36 ++++++++++++++++++------------------
 usr.bin/make/unit-tests/dir.mk  |  28 ++++++++++++++--------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diffs (118 lines):

diff -r 86b39c8ca1df -r a2dbfeace8d9 usr.bin/make/unit-tests/dir.exp
--- a/usr.bin/make/unit-tests/dir.exp   Sat Oct 31 21:09:22 2020 +0000
+++ b/usr.bin/make/unit-tests/dir.exp   Sat Oct 31 21:12:36 2020 +0000
@@ -1,19 +1,19 @@
-1
-2
-3
-4
-5
-13
-14
-15
-pre-patch
-pre-configure
-patch
-configure
-fetch
-fetch-post
-extract
-extract-post
-dup-1
-single-word
+: 1
+: 2
+: 3
+: 4
+: 5
+: 13
+: 14
+: 15
+: pre-patch
+: pre-configure
+: patch
+: configure
+: fetch
+: fetch-post
+: extract
+: extract-post
+: dup-1
+: single-word
 exit status 0
diff -r 86b39c8ca1df -r a2dbfeace8d9 usr.bin/make/unit-tests/dir.mk
--- a/usr.bin/make/unit-tests/dir.mk    Sat Oct 31 21:09:22 2020 +0000
+++ b/usr.bin/make/unit-tests/dir.mk    Sat Oct 31 21:12:36 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dir.mk,v 1.5 2020/09/07 19:48:08 rillig Exp $
+# $NetBSD: dir.mk,v 1.6 2020/10/31 21:12:36 rillig Exp $
 #
 # Tests for dir.c.
 
@@ -7,54 +7,54 @@
 all: {one,two,three}
 
 one:
-       @echo 1
+       : 1
 two:
-       @echo 2
+       : 2
 three:
-       @echo 3
+       : 3
 
 # The braces may start in the middle of a word.
 all: f{our,ive}
 
 four:
-       @echo 4
+       : 4
 five:
-       @echo 5
+       : 5
 six:
-       @echo 6
+       : 6
 
 # Nested braces work as expected since 2020-07-31 19:06 UTC.
 # They had been broken at least since 2003-01-01, probably even longer.
 all: {{thi,fou}r,fif}teen
 
 thirteen:
-       @echo 13
+       : 13
 fourteen:
-       @echo 14
+       : 14
 fifteen:
-       @echo 15
+       : 15
 
 # There may be multiple brace groups side by side.
 all: {pre-,}{patch,configure}
 
 pre-patch patch pre-configure configure:
-       @echo $@
+       : $@
 
 # Empty pieces are allowed in the braces.
 all: {fetch,extract}{,-post}
 
 fetch fetch-post extract extract-post:
-       @echo $@
+       : $@
 
 # The expansions may have duplicates.
 # These are merged together because of the dependency line.
 all: dup-{1,1,1,1,1,1,1}
 
 dup-1:
-       @echo $@
+       : $@
 
 # Other than in Bash, the braces are also expanded if there is no comma.
 all: {{{{{{{{{{single-word}}}}}}}}}}
 
 single-word:
-       @echo $@
+       : $@