summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2014-12-07 15:02:28 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2014-12-07 15:02:28 +0000
commitaac25625e43f415587f2631bb6792ff4f13d19dd (patch)
tree00a7b5d291c8ce5cc664669ecbc375f67b69d263 /regress/usr.bin
parent34c623132dbf83f05cbb7ba8fc1961b92b75e995 (diff)
Add a test which would previously often cause make to crash when run
with malloc.conf J/Junk. This problem was fixed by espie in targequiv.c rev 1.6. Crash found with the afl fuzzer.
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/make/Makefile7
-rw-r--r--regress/usr.bin/make/mk363
2 files changed, 8 insertions, 2 deletions
diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile
index 30868a75b16..28899e0b278 100644
--- a/regress/usr.bin/make/Makefile
+++ b/regress/usr.bin/make/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.36 2014/09/17 02:20:07 lteo Exp $
+# $OpenBSD: Makefile,v 1.37 2014/12/07 15:02:27 jsg Exp $
# We don't pass t7, t13, t14, t17, t19, t20 t21 t26
# 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 t21 t22 t23 t24 \
t25 t26 t27 t28 t29 t30 t31 t32 t33 t34 t35 t36 \
- t37 t38 t38j t39
+ t37 t38 t38j t39 t40
MALLOC_OPTIONS?=AJ
t1: t1.out
@@ -162,6 +162,9 @@ t38j:
t39:
cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk35 2>&1 | diff - t39.out
+t40:
+ cd ${.CURDIR} && env -i PATH=${PATH} MALLOC_OPTIONS=${MALLOC_OPTIONS} ${MAKE} -r -f mk36 2>/dev/null
+
t1.out:
echo MACHINE_ARCH=${MACHINE_ARCH} >$@
diff --git a/regress/usr.bin/make/mk36 b/regress/usr.bin/make/mk36
new file mode 100644
index 00000000000..7a9de391f21
--- /dev/null
+++ b/regress/usr.bin/make/mk36
@@ -0,0 +1,3 @@
+# $OpenBSD: mk36,v 1.1 2014/12/07 15:02:27 jsg Exp $
+# used to cause a crash with malloc 'J', fixed in targequiv.c rev 1.6
+! /