summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-24 17:28:45 +1100
committerDamien Miller <djm@mindrot.org>2010-02-24 17:28:45 +1100
commit8f9492c90d02f97cf7248147961b3f2a9de075d8 (patch)
tree027a27ac4305d7407333d77d79e8788b6a4033ab
parentbb4ae5583bffe27d9485198e199bea9767701bb1 (diff)
- djm@cvs.openbsd.org 2010/02/09 06:29:02
[regress/Makefile] turn on all the malloc(3) checking options when running regression tests. this has caught a few bugs for me in the past; ok dtucker@
-rw-r--r--ChangeLog4
-rw-r--r--regress/Makefile9
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0765008f..5595fdbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@
- djm@cvs.openbsd.org 2010/02/09 04:57:36
[regress/addrmatch.sh]
clean up droppings
+ - djm@cvs.openbsd.org 2010/02/09 06:29:02
+ [regress/Makefile]
+ turn on all the malloc(3) checking options when running regression
+ tests. this has caught a few bugs for me in the past; ok dtucker@
20100212
- (djm) OpenBSD CVS Sync
diff --git a/regress/Makefile b/regress/Makefile
index 761cc286..42e84d4c 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2009/11/09 04:20:04 dtucker Exp $
+# $OpenBSD: Makefile,v 1.51 2010/02/09 06:29:02 djm Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec
tests: $(REGRESS_TARGETS)
@@ -68,6 +68,9 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
putty.rsa2
+# Enable all malloc(3) randomisations and checks
+TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
+
t1:
ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
@@ -106,13 +109,13 @@ t-exec: ${LTESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \
for TEST in ""$?; do \
echo "run test $${TEST}" ... 1>&2; \
- (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+ (env SUDO=${SUDO} TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
done
t-exec-interop: ${INTEROP_TESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \
for TEST in ""$?; do \
echo "run test $${TEST}" ... 1>&2; \
- (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+ (env SUDO=${SUDO} TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
done