summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--regress/sftp.sh24
2 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 69fa5637c..ef124628b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
14 - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh 14 - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh
15 regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh 15 regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh
16 regress/transfer.sh] Use ${EXEEXT} where appropriate. 16 regress/transfer.sh] Use ${EXEEXT} where appropriate.
17 - [regress/sftp.sh] Remove dependency on /dev/stdin.
17 18
1820030903 1920030903
19 - (djm) OpenBSD CVS Sync 20 - (djm) OpenBSD CVS Sync
@@ -1004,4 +1005,4 @@
1004 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1005 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1005 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1006 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1006 1007
1007$Id: ChangeLog,v 1.2949 2003/09/04 04:54:39 dtucker Exp $ 1008$Id: ChangeLog,v 1.2950 2003/09/04 05:00:55 dtucker Exp $
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"
6DATA=/bin/ls${EXEEXT} 6DATA=/bin/ls${EXEEXT}
7COPY=${OBJ}/copy 7COPY=${OBJ}/copy
8 8
9SFTPCMDFILE=${OBJ}/batch
10cat >$SFTPCMDFILE <<EOF
11version
12get $DATA ${COPY}.1
13put $DATA ${COPY}.2
14EOF
15
9BUFFERSIZE="5 1000 32000 64000" 16BUFFERSIZE="5 1000 32000 64000"
10REQUESTS="1 2 10" 17REQUESTS="1 2 10"
11 18
12for B in ${BUFFERSIZE}; do 19for B in ${BUFFERSIZE}; do
13 for R in ${REQUESTS}; do 20 for R in ${REQUESTS}; do
14 verbose "test $tid: buffer_size $B num_requests $R" 21 verbose "test $tid: buffer_size $B num_requests $R"
15 rm -f ${COPY}.1 ${COPY}.2 22 rm -f ${COPY}.1 ${COPY}.2
16 ${SFTP} -P ${SFTPSERVER} -B $B -R $R -b /dev/stdin \ 23 ${SFTP} -P ${SFTPSERVER} -B $B -R $R -b $SFTPCMDFILE \
17 > /dev/null 2>&1 << EOF 24 > /dev/null 2>&1
18 version
19 get $DATA ${COPY}.1
20 put $DATA ${COPY}.2
21EOF
22 r=$? 25 r=$?
23 if [ $r -ne 0 ]; then 26 if [ $r -ne 0 ]; then
24 fail "sftp failed with $r" 27 fail "sftp failed with $r"
28 else
29 cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
30 cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
25 fi 31 fi
26 cmp $DATA ${COPY}.1 || fail "corrupted copy after get"
27 cmp $DATA ${COPY}.2 || fail "corrupted copy after put"
28 done 32 done
29done 33done
34rm -f ${COPY}.1 ${COPY}.2
35rm -f $SFTPCMDFILE