Module Name: src
Committed By: rillig
Date: Sat Oct 31 21:12:36 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: dir.exp dir.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/dir.exp \
src/usr.bin/make/unit-tests/dir.mk
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/dir.exp
diff -u src/usr.bin/make/unit-tests/dir.exp:1.5 src/usr.bin/make/unit-tests/dir.exp:1.6
--- src/usr.bin/make/unit-tests/dir.exp:1.5 Fri Jul 31 20:16:21 2020
+++ src/usr.bin/make/unit-tests/dir.exp Sat Oct 31 21:12:36 2020
@@ -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
Index: src/usr.bin/make/unit-tests/dir.mk
diff -u src/usr.bin/make/unit-tests/dir.mk:1.5 src/usr.bin/make/unit-tests/dir.mk:1.6
--- src/usr.bin/make/unit-tests/dir.mk:1.5 Mon Sep 7 19:48:08 2020
+++ src/usr.bin/make/unit-tests/dir.mk Sat Oct 31 21:12:36 2020
@@ -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 $@
+ : $@
