diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-02-18 12:52:27 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-02-18 12:52:27 +0000 |
| commit | 88fecc38d778ff7b29d50a0aa362071eb60ce1db (patch) | |
| tree | 08728f7dabe1203afbb32bffc99d99bcfdab6659 /regress | |
| parent | 59ca8d6bdf66795f6a9f26abbdddfa9289e39806 (diff) | |
no printf+\r, just use echo
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/ssh/exit-status.sh | 5 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/try-ciphers.sh | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/regress/usr.bin/ssh/exit-status.sh b/regress/usr.bin/ssh/exit-status.sh index bb5759c8588..64e17b0214a 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.4 2002/02/18 11:40:42 markus Exp $ +# $OpenBSD: exit-status.sh,v 1.5 2002/02/18 12:52:26 markus Exp $ # Placed in the Public Domain. tid="remote exit status" @@ -6,7 +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" + verbose "test $tid: proto $p status $s" ssh -$p -F $OBJ/ssh_proxy otherhost exit $s r=$? if [ $r -ne $s ]; then @@ -22,4 +22,3 @@ 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 c7d20e74a49..ff437620e4d 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.7 2002/02/18 11:40:42 markus Exp $ +# $OpenBSD: test-exec.sh,v 1.8 2002/02/18 12:52:26 markus Exp $ # Placed in the Public Domain. PORT=4242 @@ -59,7 +59,7 @@ trace () verbose () { if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then - printf "$@" + echo "$@" fi } diff --git a/regress/usr.bin/ssh/try-ciphers.sh b/regress/usr.bin/ssh/try-ciphers.sh index 4664c1fa3a0..527849f6489 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.4 2002/02/18 11:40:42 markus Exp $ +# $OpenBSD: try-ciphers.sh,v 1.5 2002/02/18 12:52:26 markus Exp $ # Placed in the Public Domain. tid="try ciphers" @@ -9,7 +9,7 @@ macs="hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96" for c in $ciphers; do for m in $macs; do trace "proto 2 cipher $c mac $m" - verbose "test $tid: proto 2 cipher $c mac $m \r" + verbose "test $tid: proto 2 cipher $c mac $m" 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" @@ -20,10 +20,9 @@ done ciphers="3des blowfish" for c in $ciphers; do trace "proto 1 cipher $c" - verbose "test $tid: proto 1 cipher $c \r" + verbose "test $tid: proto 1 cipher $c" 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" |