diff options
Diffstat (limited to 'regress/Makefile')
-rw-r--r-- | regress/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/regress/Makefile b/regress/Makefile index 761cc286a..42e84d4c5 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.50 2009/11/09 04:20:04 dtucker Exp $ | 1 | # $OpenBSD: Makefile,v 1.51 2010/02/09 06:29:02 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
@@ -68,6 +68,9 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | |||
68 | sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \ | 68 | sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \ |
69 | putty.rsa2 | 69 | putty.rsa2 |
70 | 70 | ||
71 | # Enable all malloc(3) randomisations and checks | ||
72 | TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" | ||
73 | |||
71 | t1: | 74 | t1: |
72 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv | 75 | ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv |
73 | 76 | ||
@@ -106,13 +109,13 @@ t-exec: ${LTESTS:=.sh} | |||
106 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 109 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
107 | for TEST in ""$?; do \ | 110 | for TEST in ""$?; do \ |
108 | echo "run test $${TEST}" ... 1>&2; \ | 111 | echo "run test $${TEST}" ... 1>&2; \ |
109 | (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | 112 | (env SUDO=${SUDO} TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
110 | done | 113 | done |
111 | 114 | ||
112 | t-exec-interop: ${INTEROP_TESTS:=.sh} | 115 | t-exec-interop: ${INTEROP_TESTS:=.sh} |
113 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 116 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
114 | for TEST in ""$?; do \ | 117 | for TEST in ""$?; do \ |
115 | echo "run test $${TEST}" ... 1>&2; \ | 118 | echo "run test $${TEST}" ... 1>&2; \ |
116 | (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | 119 | (env SUDO=${SUDO} TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
117 | done | 120 | done |
118 | 121 | ||