summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-12 12:51:54 +1100
committerDamien Miller <djm@mindrot.org>2012-12-12 12:51:54 +1100
commitfaabeb6b36df2e1d17b5d23280812c68900d4e40 (patch)
treeaeb3f28da05301c39cb46bcbb608fb6807f34d72
parent37461d7391e0944d880757b9ac8c98d1feb15a40 (diff)
- (djm) [regress/Makefile] fix t-exec rule
-rw-r--r--ChangeLog1
-rw-r--r--regress/Makefile10
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9473d60c..93f2404f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
- (djm) [regress/Makefile regress/integrity.sh] Make the integrity.sh test
work on platforms without 'jot'
- (djm) [regress/integrity.sh] Fix awk quoting, packet length skip
+ - (djm) [regress/Makefile] fix t-exec rule
20121207
- (dtucker) OpenBSD CVS Sync
diff --git a/regress/Makefile b/regress/Makefile
index 63685866..af1fa31d 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.61 2012/12/11 22:42:11 markus Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
-tests: $(REGRESS_TARGETS)
+tests: prereq $(REGRESS_TARGETS)
# Interop tests are not run by default
interop interop-tests: t-exec-interop
@@ -143,15 +143,17 @@ t9: $(OBJ)/t9.out
test "${TEST_SSH_ECC}" != yes || \
${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null
-t-exec: ${LTESTS:=.sh} modpipe
+prereq: modpipe
+
+modpipe: modpipe.c
+
+t-exec: ${LTESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \
for TEST in ""$?; do \
echo "run test $${TEST}" ... 1>&2; \
(env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
done
-modpipe: modpipe.c
-
t-exec-interop: ${INTEROP_TESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \
for TEST in ""$?; do \