3 files changed, 22 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 00864980a..f5a1b14c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@
      [sftp.c]
      don't show .files by default in ls, add -a option to turn them back on;
      ok markus
+   - markus@cvs.openbsd.org 2004/06/22 03:12:13
+     [regress/envpass.sh regress/multiplex.sh]
+     more portable env passing tests
  - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket".
  - (dtucker) [defines.h] Define __dead if not already defined.
 
@@ -1362,4 +1365,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3430 2004/06/22 03:37:11 mouring Exp $
+$Id: ChangeLog,v 1.3431 2004/06/22 03:38:56 dtucker Exp $
diff --git a/regress/envpass.sh b/regress/envpass.sh
index 67044d421..a5bae06dd 100644
--- a/regress/envpass.sh
+++ b/regress/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/multiplex.sh b/regress/multiplex.sh
index c167b9632..dbf2025be 100644
--- a/regress/multiplex.sh
+++ b/regress/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,12 +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 120
+${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost sleep 120
 
 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