Module Name: src
Committed By: rillig
Date: Fri Jul 31 20:08:08 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: dir.exp dir.mk
Log Message:
make(1): add more tests for expanding curly braces in dependencies
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/dir.exp
cvs rdiff -u -r1.2 -r1.3 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.3 src/usr.bin/make/unit-tests/dir.exp:1.4
--- src/usr.bin/make/unit-tests/dir.exp:1.3 Fri Jul 31 20:02:44 2020
+++ src/usr.bin/make/unit-tests/dir.exp Fri Jul 31 20:08:08 2020
@@ -10,4 +10,9 @@ pre-patch
pre-configure
patch
configure
+fetch
+fetch-post
+extract
+extract-post
+dup-1
exit status 0
Index: src/usr.bin/make/unit-tests/dir.mk
diff -u src/usr.bin/make/unit-tests/dir.mk:1.2 src/usr.bin/make/unit-tests/dir.mk:1.3
--- src/usr.bin/make/unit-tests/dir.mk:1.2 Fri Jul 31 20:02:44 2020
+++ src/usr.bin/make/unit-tests/dir.mk Fri Jul 31 20:08:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: dir.mk,v 1.2 2020/07/31 20:02:44 rillig Exp $
+# $NetBSD: dir.mk,v 1.3 2020/07/31 20:08:08 rillig Exp $
#
# Tests for dir.c.
@@ -32,7 +32,21 @@ fourteen:
fifteen:
@echo 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 $@
