diff options
| -rw-r--r-- | regress/usr.bin/ssh/Makefile | 3 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/exit-status.sh | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 12 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/try-ciphers.sh | 7 |
4 files changed, 19 insertions, 7 deletions
diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile index ed9b8b4c76a..f2e9b4acfe5 100644 --- a/regress/usr.bin/ssh/Makefile +++ b/regress/usr.bin/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/02/15 14:41:38 markus Exp $ +# $OpenBSD: Makefile,v 1.4 2002/02/18 11:40:42 markus Exp $ REGRESSTARGETS= t1 t2 t3 t4 t5 t6 t7 @@ -58,7 +58,6 @@ t7: t7.out .for t in ${LTESTS} REGRESSTARGETS+=t-${t} -REGRESSSLOWTARGETS+=t-${t} t-${t}: sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh .endfor diff --git a/regress/usr.bin/ssh/exit-status.sh b/regress/usr.bin/ssh/exit-status.sh index d48e4c81d6c..bb5759c8588 100644 --- a/regress/usr.bin/ssh/exit-status.sh +++ b/regress/usr.bin/ssh/exit-status.sh @@ -1,4 +1,4 @@ -# $OpenBSD: exit-status.sh,v 1.3 2002/02/16 01:09:47 markus Exp $ +# $OpenBSD: exit-status.sh,v 1.4 2002/02/18 11:40:42 markus Exp $ # Placed in the Public Domain. tid="remote exit status" @@ -6,6 +6,7 @@ tid="remote exit status" for p in 1 2; do for s in 0 1 4 5 44; do trace "proto $p status $s" + verbose "test $tid: proto $p status $s \r" ssh -$p -F $OBJ/ssh_proxy otherhost exit $s r=$? if [ $r -ne $s ]; then @@ -21,3 +22,4 @@ for p in 1 2; do fi done done +verbose "\n" diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index 618b9b072d0..c7d20e74a49 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.6 2002/02/18 10:09:20 markus Exp $ +# $OpenBSD: test-exec.sh,v 1.7 2002/02/18 11:40:42 markus Exp $ # Placed in the Public Domain. PORT=4242 @@ -51,11 +51,19 @@ cleanup () trace () { - if [ "X$TEST_DEBUG_SSH" = "Xyes" ]; then + if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then echo "$@" fi } +verbose () +{ + if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then + printf "$@" + fi +} + + fail () { RESULT=1 diff --git a/regress/usr.bin/ssh/try-ciphers.sh b/regress/usr.bin/ssh/try-ciphers.sh index aed6097798e..4664c1fa3a0 100644 --- a/regress/usr.bin/ssh/try-ciphers.sh +++ b/regress/usr.bin/ssh/try-ciphers.sh @@ -1,4 +1,4 @@ -# $OpenBSD: try-ciphers.sh,v 1.3 2002/02/16 01:09:47 markus Exp $ +# $OpenBSD: try-ciphers.sh,v 1.4 2002/02/18 11:40:42 markus Exp $ # Placed in the Public Domain. tid="try ciphers" @@ -8,7 +8,8 @@ macs="hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96" for c in $ciphers; do for m in $macs; do - trace "proto 2 mac $m cipher $c" + trace "proto 2 cipher $c mac $m" + verbose "test $tid: proto 2 cipher $c mac $m \r" ssh -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true if [ $? -ne 0 ]; then fail "ssh -2 failed with mac $m cipher $c" @@ -19,8 +20,10 @@ done ciphers="3des blowfish" for c in $ciphers; do trace "proto 1 cipher $c" + verbose "test $tid: proto 1 cipher $c \r" ssh -F $OBJ/ssh_proxy -1 -c $c somehost true if [ $? -ne 0 ]; then fail "ssh -1 failed with cipher $c" fi done +verbose "\n" |