From 3bcce80b544174b70dfd6e0a4e9f1488ca6fa69b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 21 May 2010 14:48:16 +1000 Subject: - djm@cvs.openbsd.org 2010/05/07 11:31:26 [regress/Makefile regress/cert-userkey.sh] regress tests for AuthorizedPrincipalsFile and "principals=" key option. feedback and ok markus@ --- regress/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'regress/Makefile') diff --git a/regress/Makefile b/regress/Makefile index d25a64555..6e7b441bf 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2010/02/26 20:33:21 djm Exp $ +# $OpenBSD: Makefile,v 1.53 2010/05/07 11:31:26 djm Exp $ REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec tests: $(REGRESS_TARGETS) @@ -69,7 +69,8 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \ sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \ known_hosts-cert host_ca_key* cert_host_key* \ - putty.rsa2 sshd_proxy_orig + putty.rsa2 sshd_proxy_orig \ + authorized_principals_${USER} # Enable all malloc(3) randomisations and checks TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" -- cgit v1.2.3 From 527ded7f643d99ef0798a3c3a19e4edc56b9289f Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 2 Jul 2010 13:40:16 +1000 Subject: - 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 --- ChangeLog | 4 ++++ regress/Makefile | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'regress/Makefile') diff --git a/ChangeLog b/ChangeLog index cf93dc9fe..e2452f427 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 6e7b441bf..9762ab204 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 -- cgit v1.2.3