summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2020-07-31 20:08:08 +0000
committerrillig <rillig@NetBSD.org>2020-07-31 20:08:08 +0000
commit8005e5ef8a51db36211cfb03de35f77aff4ce03c (patch)
tree0f55fb522e90e874cdc9daad05603ae735ad5686 /usr.bin
parent4253ed5d6d081dcfd3d409c28bef62e2cddefcb2 (diff)
make(1): add more tests for expanding curly braces in dependencies
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/unit-tests/dir.exp5
-rw-r--r--usr.bin/make/unit-tests/dir.mk16
2 files changed, 20 insertions, 1 deletions
diff --git a/usr.bin/make/unit-tests/dir.exp b/usr.bin/make/unit-tests/dir.exp
index efd861fe176..8801165648b 100644
--- a/usr.bin/make/unit-tests/dir.exp
+++ b/usr.bin/make/unit-tests/dir.exp
@@ -10,4 +10,9 @@ pre-patch
pre-configure
patch
configure
+fetch
+fetch-post
+extract
+extract-post
+dup-1
exit status 0
diff --git a/usr.bin/make/unit-tests/dir.mk b/usr.bin/make/unit-tests/dir.mk
index 5e314e7c97e..4b4569bbf2a 100644
--- a/usr.bin/make/unit-tests/dir.mk
+++ b/usr.bin/make/unit-tests/dir.mk
@@ -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 $@