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

1 files changed, 15 insertions, 9 deletions

diff --git a/regress/sftp.sh b/regress/sftp.sh
index 17a0a2b99..0e22f8f6b 100644
--- a/regress/sftp.sh
+++ b/regress/sftp.sh
@@ -6,24 +6,30 @@ tid="basic sftp put/get"
 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"
 
 for B in ${BUFFERSIZE}; do
         for R in ${REQUESTS}; do
                 verbose "test $tid: buffer_size $B num_requests $R"
-                rm -f ${COPY}.1 ${COPY}.2
-                ${SFTP} -P ${SFTPSERVER} -B $B -R $R -b /dev/stdin \
-                > /dev/null 2>&1 << EOF
-                version
-                get $DATA ${COPY}.1
-                put $DATA ${COPY}.2
-EOF
+                rm -f ${COPY}.1 ${COPY}.2                
+                ${SFTP} -P ${SFTPSERVER} -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
+rm -f ${COPY}.1 ${COPY}.2                
+rm -f $SFTPCMDFILE