diff options
| author | Damien Miller <djm@mindrot.org> | 2010-07-02 13:40:16 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-07-02 13:40:16 +1000 |
| commit | 527ded7f643d99ef0798a3c3a19e4edc56b9289f (patch) | |
| tree | 3096215f1119a28bd77d8c29d225f9b728e2754a | |
| parent | 0979b40934a59615d8fa1535103d51f11c04bad2 (diff) | |
- phessler@cvs.openbsd.org 2010/06/27 19:19:56
[Makefile]
fix how we run the tests so we can successfully use SUDO='sudo -E'
in our env
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | regress/Makefile | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -28,6 +28,10 @@ Fix a longstanding problem where if you suspend scp at the password/passphrase prompt the terminal mode is not restored. OK djm@ + - phessler@cvs.openbsd.org 2010/06/27 19:19:56 + [regress/Makefile] + fix how we run the tests so we can successfully use SUDO='sudo -E' + in our env 20100627 - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs diff --git a/regress/Makefile b/regress/Makefile index 6e7b441b..9762ab20 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.53 2010/05/07 11:31:26 djm Exp $ +# $OpenBSD: Makefile,v 1.54 2010/06/27 19:19:56 phessler Exp $ REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec tests: $(REGRESS_TARGETS) @@ -113,13 +113,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} TEST_ENV=${TEST_ENV} 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} TEST_ENV=${TEST_ENV} 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 |