diff options
| author | dtucker <dtucker> | 2003-09-04 05:16:56 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2003-09-04 05:16:56 +0000 |
| commit | 50ebebd8b90054b6ad6762c696c67b3388d359a9 (patch) | |
| tree | ea1f63e681e012e53b83fbf08d023ed36250f190 /regress/test-exec.sh | |
| parent | 23515321d82cd8cecadd4011233847bdd5633e5b (diff) | |
| download | openssh-50ebebd8b90054b6ad6762c696c67b3388d359a9.tar.gz | |
- [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh
regress/test-exec.sh] Handle different was of echoing without newlines.
Diffstat (limited to 'regress/test-exec.sh')
| -rw-r--r-- | regress/test-exec.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index a7a8ddbe..35f555b2 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -72,6 +72,17 @@ export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER # helper +echon() +{ + if [ "x`echo -n`" = "x" ]; then + echo -n "$@" + elif [ "x`echo '\c'`" = "x" ]; then + echo "$@\c" + else + fatal "Don't know how to echo without newline." + fi +} + cleanup () { if [ -f $PIDFILE ]; then @@ -111,7 +122,7 @@ fail () fatal () { - echo -n "FATAL: " + echon "FATAL: " fail "$@" cleanup exit $RESULT @@ -169,7 +180,7 @@ for t in rsa rsa1; do # known hosts file for client ( - echo -n 'localhost-with-alias,127.0.0.1,::1 ' + echon 'localhost-with-alias,127.0.0.1,::1 ' cat $OBJ/$t.pub ) >> $OBJ/known_hosts |