Check curly braces expansion.

3 files changed, 30 insertions, 2 deletions

diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile
index d5327f2e702..004ed84955c 100644
--- a/regress/usr.bin/make/Makefile
+++ b/regress/usr.bin/make/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2001/05/15 13:40:02 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2001/05/26 21:12:27 espie Exp $
 
 NOMAN=
 NOPROG=
 
-regress: t1 t2 t3 t4 t5 t6 t8 t9 t10 t11 t7
+regress: t1 t2 t3 t4 t5 t6 t8 t9 t10 t11 t12 t7
 
 MALLOC_OPTIONS?=AZJ
 t1: t1.out
@@ -59,6 +59,10 @@ t11:
 	cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk11 |diff - t11.out
 	cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk11 A=t|diff - t11.out2
 
+# Check for filename expansions.
+t12:
+	cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk12 |diff - t12.out
+
 z.a:
 	touch $@
 
diff --git a/regress/usr.bin/make/mk12 b/regress/usr.bin/make/mk12
new file mode 100644
index 00000000000..e82ef809baf
--- /dev/null
+++ b/regress/usr.bin/make/mk12
@@ -0,0 +1,21 @@
+# Check out that brace expansion works
+T1=mk{1,4a,11}
+
+# Now for funnier stuff
+T2=m?{1,4*,11}
+
+# Recursive fun
+T3=mk{1,4{,a},1{0,1}}
+
+all: a b c
+
+a: ${T1}
+	@echo ${>:T}
+
+b: ${T2}
+	@echo ${>:T}
+
+c: ${T3}
+	@echo ${>:T}
+
+.PHONY: a b c all
diff --git a/regress/usr.bin/make/t12.out b/regress/usr.bin/make/t12.out
new file mode 100644
index 00000000000..842b6a11775
--- /dev/null
+++ b/regress/usr.bin/make/t12.out
@@ -0,0 +1,3 @@
+mk1 mk4a mk11
+mk1 mk4a mk4 mk11
+mk1 mk4 mk4a mk10 mk11