diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2004-06-22 03:12:14 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2004-06-22 03:12:14 +0000 |
| commit | 23f2f7013f3dee748995253841a77581c0454018 (patch) | |
| tree | 0d66680e6155c54a7963ff0ae48c2cef22115c6c | |
| parent | 29e3040f685d974c53e21ce4d29c26b50cb3081d (diff) | |
more portable env passing tests
| -rw-r--r-- | regress/usr.bin/ssh/envpass.sh | 19 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/multiplex.sh | 8 |
2 files changed, 18 insertions, 9 deletions
diff --git a/regress/usr.bin/ssh/envpass.sh b/regress/usr.bin/ssh/envpass.sh index 67044d421cd..a5bae06dd4f 100644 --- a/regress/usr.bin/ssh/envpass.sh +++ b/regress/usr.bin/ssh/envpass.sh @@ -1,4 +1,4 @@ -# $OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $ +# $OpenBSD: envpass.sh,v 1.2 2004/06/22 03:12:13 markus Exp $ # Placed in the Public Domain. tid="environment passing" @@ -8,7 +8,9 @@ tid="environment passing" trace "pass env, don't accept" verbose "test $tid: pass env, don't accept" _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \ - '[ -z "$_TEST_ENV" ]' + sh << 'EOF' + test -z $_TEST_ENV +EOF r=$? if [ $r -ne 0 ]; then fail "environment found" @@ -17,7 +19,9 @@ fi trace "don't pass env, accept" verbose "test $tid: don't pass env, accept" ${SSH} -F $OBJ/ssh_proxy otherhost \ - '[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]' + sh << 'EOF' + test -z $_XXX_TEST_A && test -z $_XXX_TEST_B +EOF r=$? if [ $r -ne 0 ]; then fail "environment found" @@ -26,7 +30,9 @@ fi trace "pass single env, accept single env" verbose "test $tid: pass single env, accept single env" _XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \ - '[ "x$_XXX_TEST" = "xblah" ]' + sh << 'EOF' + test X"$_XXX_TEST" = X"blah" +EOF r=$? if [ $r -ne 0 ]; then fail "environment not found" @@ -36,9 +42,10 @@ trace "pass multiple env, accept multiple env" verbose "test $tid: pass multiple env, accept multiple env" _XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \ -F $OBJ/ssh_proxy otherhost \ - '[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]' + sh << 'EOF' + test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2" +EOF r=$? if [ $r -ne 0 ]; then fail "environment not found" fi - diff --git a/regress/usr.bin/ssh/multiplex.sh b/regress/usr.bin/ssh/multiplex.sh index 9a011006d02..63c0e592160 100644 --- a/regress/usr.bin/ssh/multiplex.sh +++ b/regress/usr.bin/ssh/multiplex.sh @@ -1,4 +1,4 @@ -# $OpenBSD: multiplex.sh,v 1.7 2004/06/18 06:15:51 dtucker Exp $ +# $OpenBSD: multiplex.sh,v 1.8 2004/06/22 03:12:13 markus Exp $ # Placed in the Public Domain. CTL=$OBJ/ctl-sock @@ -11,11 +11,13 @@ COPY=$OBJ/ls.copy start_sshd trace "start master, fork to background" -${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost sleep 60 +${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost sleep 60 verbose "test $tid: envpass" trace "env passing over multiplexed connection" -_XXX_TEST=blah ${SSH} -S$CTL otherhost '[ "x$_XXX_TEST" = "xblah" ]' +_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -S$CTL otherhost sh << 'EOF' + test X"$_XXX_TEST" = X"blah" +EOF if [ $? -ne 0 ]; then fail "environment not found" fi |