summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--regress/Makefile10
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9473d60ca..93f2404f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
28 - (djm) [regress/Makefile regress/integrity.sh] Make the integrity.sh test 28 - (djm) [regress/Makefile regress/integrity.sh] Make the integrity.sh test
29 work on platforms without 'jot' 29 work on platforms without 'jot'
30 - (djm) [regress/integrity.sh] Fix awk quoting, packet length skip 30 - (djm) [regress/integrity.sh] Fix awk quoting, packet length skip
31 - (djm) [regress/Makefile] fix t-exec rule
31 32
3220121207 3320121207
33 - (dtucker) OpenBSD CVS Sync 34 - (dtucker) OpenBSD CVS Sync
diff --git a/regress/Makefile b/regress/Makefile
index 636858662..af1fa31df 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,7 +1,7 @@
1# $OpenBSD: Makefile,v 1.61 2012/12/11 22:42:11 markus Exp $ 1# $OpenBSD: Makefile,v 1.61 2012/12/11 22:42:11 markus Exp $
2 2
3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec 3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
4tests: $(REGRESS_TARGETS) 4tests: prereq $(REGRESS_TARGETS)
5 5
6# Interop tests are not run by default 6# Interop tests are not run by default
7interop interop-tests: t-exec-interop 7interop interop-tests: t-exec-interop
@@ -143,15 +143,17 @@ t9: $(OBJ)/t9.out
143 test "${TEST_SSH_ECC}" != yes || \ 143 test "${TEST_SSH_ECC}" != yes || \
144 ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null 144 ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null
145 145
146t-exec: ${LTESTS:=.sh} modpipe 146prereq: modpipe
147
148modpipe: modpipe.c
149
150t-exec: ${LTESTS:=.sh}
147 @if [ "x$?" = "x" ]; then exit 0; fi; \ 151 @if [ "x$?" = "x" ]; then exit 0; fi; \
148 for TEST in ""$?; do \ 152 for TEST in ""$?; do \
149 echo "run test $${TEST}" ... 1>&2; \ 153 echo "run test $${TEST}" ... 1>&2; \
150 (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ 154 (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
151 done 155 done
152 156
153modpipe: modpipe.c
154
155t-exec-interop: ${INTEROP_TESTS:=.sh} 157t-exec-interop: ${INTEROP_TESTS:=.sh}
156 @if [ "x$?" = "x" ]; then exit 0; fi; \ 158 @if [ "x$?" = "x" ]; then exit 0; fi; \
157 for TEST in ""$?; do \ 159 for TEST in ""$?; do \