diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | regress/Makefile | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -28,6 +28,10 @@ | |||
28 | Fix a longstanding problem where if you suspend scp at the | 28 | Fix a longstanding problem where if you suspend scp at the |
29 | password/passphrase prompt the terminal mode is not restored. | 29 | password/passphrase prompt the terminal mode is not restored. |
30 | OK djm@ | 30 | OK djm@ |
31 | - phessler@cvs.openbsd.org 2010/06/27 19:19:56 | ||
32 | [regress/Makefile] | ||
33 | fix how we run the tests so we can successfully use SUDO='sudo -E' | ||
34 | in our env | ||
31 | 35 | ||
32 | 20100627 | 36 | 20100627 |
33 | - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs | 37 | - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs |
diff --git a/regress/Makefile b/regress/Makefile index 6e7b441bf..9762ab204 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.53 2010/05/07 11:31:26 djm Exp $ | 1 | # $OpenBSD: Makefile,v 1.54 2010/06/27 19:19:56 phessler 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) |
@@ -113,13 +113,13 @@ t-exec: ${LTESTS:=.sh} | |||
113 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 113 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
114 | for TEST in ""$?; do \ | 114 | for TEST in ""$?; do \ |
115 | echo "run test $${TEST}" ... 1>&2; \ | 115 | echo "run test $${TEST}" ... 1>&2; \ |
116 | (env SUDO=${SUDO} TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | 116 | (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
117 | done | 117 | done |
118 | 118 | ||
119 | t-exec-interop: ${INTEROP_TESTS:=.sh} | 119 | t-exec-interop: ${INTEROP_TESTS:=.sh} |
120 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 120 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
121 | for TEST in ""$?; do \ | 121 | for TEST in ""$?; do \ |
122 | echo "run test $${TEST}" ... 1>&2; \ | 122 | echo "run test $${TEST}" ... 1>&2; \ |
123 | (env SUDO=${SUDO} TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | 123 | (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
124 | done | 124 | done |
125 | 125 | ||