diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-09-04 14:54:39 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-09-04 14:54:39 +1000 |
commit | c2c4223ed037375ac73a55a3b75f9154fe9c6037 (patch) | |
tree | f3ffad4d128f14baec612891c5a983d1ae85c844 | |
parent | c376a88c102e237eb0172f7afcc496ce7311a0fe (diff) |
- [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.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/sftp-badcmds.sh | 4 | ||||
-rw-r--r-- | regress/sftp-cmds.sh | 18 | ||||
-rw-r--r-- | regress/sftp.sh | 2 | ||||
-rw-r--r-- | regress/ssh-com-client.sh | 2 | ||||
-rw-r--r-- | regress/ssh-com-sftp.sh | 2 | ||||
-rw-r--r-- | regress/stderr-data.sh | 2 | ||||
-rw-r--r-- | regress/transfer.sh | 2 |
8 files changed, 20 insertions, 17 deletions
@@ -11,6 +11,9 @@ | |||
11 | it). The sparse file will take less disk space too. | 11 | it). The sparse file will take less disk space too. |
12 | - [regress/sftp-cmds.sh] Ensure file used for test are readable. | 12 | - [regress/sftp-cmds.sh] Ensure file used for test are readable. |
13 | - [regress/stderr-after-eof.sh] Search for a usable checksum program. | 13 | - [regress/stderr-after-eof.sh] Search for a usable checksum program. |
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 | ||
16 | regress/transfer.sh] Use ${EXEEXT} where appropriate. | ||
14 | 17 | ||
15 | 20030903 | 18 | 20030903 |
16 | - (djm) OpenBSD CVS Sync | 19 | - (djm) OpenBSD CVS Sync |
@@ -1001,4 +1004,4 @@ | |||
1001 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1004 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1002 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1005 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1003 | 1006 | ||
1004 | $Id: ChangeLog,v 1.2948 2003/09/04 04:32:02 dtucker Exp $ | 1007 | $Id: ChangeLog,v 1.2949 2003/09/04 04:54:39 dtucker Exp $ |
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh index ca46909c0..4fe32effa 100644 --- a/regress/sftp-badcmds.sh +++ b/regress/sftp-badcmds.sh | |||
@@ -3,8 +3,8 @@ | |||
3 | 3 | ||
4 | tid="sftp invalid commands" | 4 | tid="sftp invalid commands" |
5 | 5 | ||
6 | DATA=/bin/ls | 6 | DATA=/bin/ls${EXEEXT} |
7 | DATA2=/bin/cat | 7 | DATA2=/bin/cat${EXEEXT} |
8 | NONEXIST=/NONEXIST.$$ | 8 | NONEXIST=/NONEXIST.$$ |
9 | COPY=${OBJ}/copy | 9 | COPY=${OBJ}/copy |
10 | GLOBFILES=`(cd /bin;echo l*)` | 10 | GLOBFILES=`(cd /bin;echo l*)` |
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh index a7d552972..c747988d1 100644 --- a/regress/sftp-cmds.sh +++ b/regress/sftp-cmds.sh | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | tid="sftp commands" | 8 | tid="sftp commands" |
9 | 9 | ||
10 | DATA=/bin/ls | 10 | DATA=/bin/ls${EXEEXT} |
11 | COPY=${OBJ}/copy | 11 | COPY=${OBJ}/copy |
12 | # test that these files are readable! | 12 | # test that these files are readable! |
13 | for i in `(cd /bin;echo l*)` | 13 | for i in `(cd /bin;echo l*)` |
@@ -70,7 +70,7 @@ rm -f ${COPY}.dd/* | |||
70 | verbose "$tid: get to directory" | 70 | verbose "$tid: get to directory" |
71 | echo "get $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 71 | echo "get $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |
72 | || fail "get failed" | 72 | || fail "get failed" |
73 | cmp $DATA ${COPY}.dd/ls || fail "corrupted copy after get" | 73 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get" |
74 | 74 | ||
75 | rm -f ${COPY}.dd/* | 75 | rm -f ${COPY}.dd/* |
76 | verbose "$tid: glob get to directory" | 76 | verbose "$tid: glob get to directory" |
@@ -82,13 +82,13 @@ done | |||
82 | 82 | ||
83 | rm -f ${COPY}.dd/* | 83 | rm -f ${COPY}.dd/* |
84 | verbose "$tid: get to local dir" | 84 | verbose "$tid: get to local dir" |
85 | echo "lcd ${COPY}.dd\nget $DATA" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 85 | (echo "lcd ${COPY}.dd"; echo "get $DATA" ) | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |
86 | || fail "get failed" | 86 | || fail "get failed" |
87 | cmp $DATA ${COPY}.dd/ls || fail "corrupted copy after get" | 87 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get" |
88 | 88 | ||
89 | rm -f ${COPY}.dd/* | 89 | rm -f ${COPY}.dd/* |
90 | verbose "$tid: glob get to local dir" | 90 | verbose "$tid: glob get to local dir" |
91 | echo "lcd ${COPY}.dd\nget /bin/l*" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 91 | (echo "lcd ${COPY}.dd"; echo "get /bin/l*") | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |
92 | || fail "get failed" | 92 | || fail "get failed" |
93 | for x in $GLOBFILES; do | 93 | for x in $GLOBFILES; do |
94 | cmp /bin/$x ${COPY}.dd/$x || fail "corrupted copy after get" | 94 | cmp /bin/$x ${COPY}.dd/$x || fail "corrupted copy after get" |
@@ -110,7 +110,7 @@ rm -f ${COPY}.dd/* | |||
110 | verbose "$tid: put to directory" | 110 | verbose "$tid: put to directory" |
111 | echo "put $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 111 | echo "put $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |
112 | || fail "put failed" | 112 | || fail "put failed" |
113 | cmp $DATA ${COPY}.dd/ls || fail "corrupted copy after put" | 113 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put" |
114 | 114 | ||
115 | rm -f ${COPY}.dd/* | 115 | rm -f ${COPY}.dd/* |
116 | verbose "$tid: glob put to directory" | 116 | verbose "$tid: glob put to directory" |
@@ -122,13 +122,13 @@ done | |||
122 | 122 | ||
123 | rm -f ${COPY}.dd/* | 123 | rm -f ${COPY}.dd/* |
124 | verbose "$tid: put to local dir" | 124 | verbose "$tid: put to local dir" |
125 | echo "cd ${COPY}.dd\nput $DATA" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 125 | (echo "cd ${COPY}.dd"; echo "put $DATA") | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |
126 | || fail "put failed" | 126 | || fail "put failed" |
127 | cmp $DATA ${COPY}.dd/ls || fail "corrupted copy after put" | 127 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put" |
128 | 128 | ||
129 | rm -f ${COPY}.dd/* | 129 | rm -f ${COPY}.dd/* |
130 | verbose "$tid: glob put to local dir" | 130 | verbose "$tid: glob put to local dir" |
131 | echo "cd ${COPY}.dd\nput /bin/l*" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 131 | (echo "cd ${COPY}.dd"; echo "put /bin/l*") | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |
132 | || fail "put failed" | 132 | || fail "put failed" |
133 | for x in $GLOBFILES; do | 133 | for x in $GLOBFILES; do |
134 | cmp /bin/$x ${COPY}.dd/$x || fail "corrupted copy after put" | 134 | cmp /bin/$x ${COPY}.dd/$x || fail "corrupted copy after put" |
diff --git a/regress/sftp.sh b/regress/sftp.sh index e8d473123..6ed4e9379 100644 --- a/regress/sftp.sh +++ b/regress/sftp.sh | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | tid="basic sftp put/get" | 4 | tid="basic sftp put/get" |
5 | 5 | ||
6 | DATA=/bin/ls | 6 | DATA=/bin/ls{EXEEXT} |
7 | COPY=${OBJ}/copy | 7 | COPY=${OBJ}/copy |
8 | 8 | ||
9 | BUFFERSIZE="5 1000 32000 64000" | 9 | BUFFERSIZE="5 1000 32000 64000" |
diff --git a/regress/ssh-com-client.sh b/regress/ssh-com-client.sh index 809736238..fc953228e 100644 --- a/regress/ssh-com-client.sh +++ b/regress/ssh-com-client.sh | |||
@@ -64,7 +64,7 @@ EOF | |||
64 | # we need a real server (no ProxyConnect option) | 64 | # we need a real server (no ProxyConnect option) |
65 | start_sshd | 65 | start_sshd |
66 | 66 | ||
67 | DATA=/bin/ls | 67 | DATA=/bin/ls${EXEEXT} |
68 | COPY=${OBJ}/copy | 68 | COPY=${OBJ}/copy |
69 | rm -f ${COPY} | 69 | rm -f ${COPY} |
70 | 70 | ||
diff --git a/regress/ssh-com-sftp.sh b/regress/ssh-com-sftp.sh index 963b40432..760cc9057 100644 --- a/regress/ssh-com-sftp.sh +++ b/regress/ssh-com-sftp.sh | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | tid="basic sftp put/get with ssh.com server" | 4 | tid="basic sftp put/get with ssh.com server" |
5 | 5 | ||
6 | DATA=/bin/ls | 6 | DATA=/bin/ls${EXEEXT} |
7 | COPY=${OBJ}/copy | 7 | COPY=${OBJ}/copy |
8 | 8 | ||
9 | BUFFERSIZE="5 1000 32000 64000" | 9 | BUFFERSIZE="5 1000 32000 64000" |
diff --git a/regress/stderr-data.sh b/regress/stderr-data.sh index 0157690b0..1daf79bb5 100644 --- a/regress/stderr-data.sh +++ b/regress/stderr-data.sh | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | tid="stderr data transfer" | 4 | tid="stderr data transfer" |
5 | 5 | ||
6 | DATA=/bin/ls | 6 | DATA=/bin/ls${EXEEXT} |
7 | COPY=${OBJ}/copy | 7 | COPY=${OBJ}/copy |
8 | rm -f ${COPY} | 8 | rm -f ${COPY} |
9 | 9 | ||
diff --git a/regress/transfer.sh b/regress/transfer.sh index 31cdc0ce3..13ea367d5 100644 --- a/regress/transfer.sh +++ b/regress/transfer.sh | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | tid="transfer data" | 4 | tid="transfer data" |
5 | 5 | ||
6 | DATA=/bin/ls | 6 | DATA=/bin/ls${EXEEXT} |
7 | COPY=${OBJ}/copy | 7 | COPY=${OBJ}/copy |
8 | 8 | ||
9 | for p in 1 2; do | 9 | for p in 1 2; do |