summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2004-11-21 12:58:13 +0000
committerMarc Espie <espie@cvs.openbsd.org>2004-11-21 12:58:13 +0000
commitb27da067f4796fb53c56d22fb7aa3342f4f856b0 (patch)
tree4fb23959243e3a9cb9f55a9d33b0a4b147a4e68e /regress
parent782da4b08bfac59ad5fb2369ebd16c20a54fd988 (diff)
subtle bug in for loop expansions,
reported by Florent Thoumie.
Diffstat (limited to 'regress')
-rw-r--r--regress/usr.bin/make/Makefile11
-rw-r--r--regress/usr.bin/make/mk2114
-rw-r--r--regress/usr.bin/make/t21.out3
3 files changed, 24 insertions, 4 deletions
diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile
index 47418be3b0f..407c8dcf552 100644
--- a/regress/usr.bin/make/Makefile
+++ b/regress/usr.bin/make/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.20 2002/09/09 10:05:34 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2004/11/21 12:58:12 espie Exp $
-# We don't pass t7, t13, t14, t17, t19, t20
+# We don't pass t7, t13, t14, t17, t19, t20 t21
# and t16 yields piss poor performance
-REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20
+REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21
MALLOC_OPTIONS?=AZJ
t1: t1.out
@@ -88,13 +88,16 @@ t19:
t20:
cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk20 | diff - t20.out
+t21:
+ cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk21 | diff - t21.out
+
z.a:
touch $@
t1.out:
echo MACHINE_ARCH=${MACHINE_ARCH} >$@
-.PHONY: t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 regress
+.PHONY: t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 t20 t21 regress
CLEANFILES+=t1.out z.a a.a a.b goodfile phony t15file
diff --git a/regress/usr.bin/make/mk21 b/regress/usr.bin/make/mk21
new file mode 100644
index 00000000000..a0f9c4137e0
--- /dev/null
+++ b/regress/usr.bin/make/mk21
@@ -0,0 +1,14 @@
+# $OpenBSD: mk21,v 1.1 2004/11/21 12:58:12 espie Exp $
+TRUC= http://heanet.dl.sourceforge.net/sourceforge/%SUBDIR%/
+
+.for _S in ${TRUC}
+S?= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
+.endfor
+
+_S= ${TRUC}
+T?= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
+
+all:
+ @echo "S= $S"
+ @echo "T= $T"
+
diff --git a/regress/usr.bin/make/t21.out b/regress/usr.bin/make/t21.out
new file mode 100644
index 00000000000..bdb258de052
--- /dev/null
+++ b/regress/usr.bin/make/t21.out
@@ -0,0 +1,3 @@
+S= http://heanet.dl.sourceforge.net/sourceforge/%SUBDIR%/
+T= http://heanet.dl.sourceforge.net/sourceforge/%SUBDIR%/
+