summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2017-07-20 21:32:11 +0000
committerMarc Espie <espie@cvs.openbsd.org>2017-07-20 21:32:11 +0000
commit53705effaf1eb75b381481ac11bd3286f6e162d0 (patch)
tree5bdca6b3d3e0c1f9dd347dcc50ea62c7378956c4 /regress/usr.bin
parent2e197e9851c291047c6aff6e2faf4494873d2cd9 (diff)
extra test because mk38 triggers two issues and fixing the first one
makes the second one vanish
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/make/Makefile13
-rw-r--r--regress/usr.bin/make/mk38bis2
2 files changed, 10 insertions, 5 deletions
diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile
index c96f5fa3c71..254e95983ba 100644
--- a/regress/usr.bin/make/Makefile
+++ b/regress/usr.bin/make/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.46 2017/07/07 16:31:37 bluhm Exp $
+# $OpenBSD: Makefile,v 1.47 2017/07/20 21:32:10 espie Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 \
t10 t11 t12 t13 t14 t15 t16 t17 t18 t19 \
t20 t21 t22 t23 t24 t25 t26 t27 t28 t29 \
t30 t31 t32 t33 t34 t35 t36 t37 t38 t38j t39 \
- t40 t41 t42 t43 t44 t45 t46 t47
+ t40 t41 t42 t42bis t43 t44 t45 t46 t47
# We don't pass t14 t17 t18 t20
# and t16 yields piss poor performance
@@ -24,9 +24,9 @@ t18:
@echo DISABLED
t20:
- # Some posix tests we don't pass yet, and won't until I've
- # added a `magic' status for variables (as SHELL is very,
- # very special, according to POSIX/Single Unix).
+ # Some posix tests we don't pass yet, and won't until I've
+ # added a `magic' status for variables (as SHELL is very,
+ # very special, according to POSIX/Single Unix).
@echo DISABLED
MALLOC_OPTIONS?=J
@@ -192,6 +192,9 @@ t41:
t42:
if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk38 2>/dev/null || test $$? -ge 128; then false; fi
+t42bis:
+ if cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk38bis 2>/dev/null || test $$? -ge 128; then false; fi
+
t43:
cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -j2 -f mk39 b 2>&1 | diff - t43.out
cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -j2 -f mk39 a 2>&1 | diff - t43.out
diff --git a/regress/usr.bin/make/mk38bis b/regress/usr.bin/make/mk38bis
new file mode 100644
index 00000000000..c705a086977
--- /dev/null
+++ b/regress/usr.bin/make/mk38bis
@@ -0,0 +1,2 @@
+# $OpenBSD: mk38bis,v 1.1 2017/07/20 21:32:10 espie Exp $
+$$$$(f.P\ON$$$$$$Y:) all