- [regress/ssh-com-sftp.sh] Remove dependency on /dev/stdin.

diff --git a/ChangeLog b/ChangeLog
index 045b26a89c8b83160a7bdf62338da15e5d62a7d3..d0a4d4657c2be051e4a283e7f5cb69475f5e9dd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@
    - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh
      regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh
      regress/transfer.sh] Use ${EXEEXT} where appropriate.
-   - [regress/sftp.sh] Remove dependency on /dev/stdin.
+   - [regress/sftp.sh regress/ssh-com-sftp.sh] Remove dependency on /dev/stdin.
    - [regress/agent-ptrace.sh regress/agent-timeout.sh]
      "grep -q" -> "grep >/dev/null"
    - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh

diff --git a/regress/ssh-com-sftp.sh b/regress/ssh-com-sftp.sh
index 760cc905700e13b64f0c2dd38ee55c82d98dba1b..6ca7dad5160417beae26ce68038e7c43c07765fe 100644 (file)
--- a/regress/ssh-com-sftp.sh
+++ b/regress/ssh-com-sftp.sh
@@ -5,6 +5,13 @@ tid="basic sftp put/get with ssh.com server"
 
 DATA=/bin/ls${EXEEXT}
 COPY=${OBJ}/copy
+SFTPCMDFILE=${OBJ}/batch
+
+cat >$SFTPCMDFILE <<EOF
+version
+get $DATA ${COPY}.1
+put $DATA ${COPY}.2
+EOF
 
 BUFFERSIZE="5 1000 32000 64000"
 REQUESTS="1 2 10"
@@ -41,18 +48,17 @@ for v in ${VERSIONS}; do
                for R in ${REQUESTS}; do
                        verbose "test $tid: buffer_size $B num_requests $R"
                        rm -f ${COPY}.1 ${COPY}.2
-                       ${SFTP} -P ${server} -B $B -R $R -b /dev/stdin \
-                       > /dev/null 2>&1 << EOF
-                       version
-                       get $DATA ${COPY}.1
-                       put $DATA ${COPY}.2
-EOF
+                       ${SFTP} -P ${server} -B $B -R $R -b $SFTPCMDFILE \
+                       > /dev/null 2>&1
                        r=$?
                        if [ $r -ne 0 ]; then
                                fail "sftp failed with $r"
+                       else                                
+                               cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
+                               cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
                        fi
-                       cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
-                       cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
                done
        done
 done
+rm -f ${COPY}.1 ${COPY}.2                
+rm -f $SFTPCMDFILE