diff options
author | Damien Miller <djm@mindrot.org> | 2013-07-25 12:11:18 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-07-25 12:11:18 +1000 |
commit | d1e26cf391de31128b4edde118bff5fed98a90ea (patch) | |
tree | c9db90de08dc58cd56d086038fa392bc2f039592 | |
parent | 78d47b7c5b182e44552913de2b4b7e0363c8e3cc (diff) |
- djm@cvs.openbsd.org 2013/06/21 02:26:26
[regress/sftp-cmds.sh regress/test-exec.sh]
unbreak sftp-cmds for renamed test data (s/ls/data/)
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | regress/sftp-cmds.sh | 10 | ||||
-rw-r--r-- | regress/test-exec.sh | 5 |
3 files changed, 11 insertions, 7 deletions
@@ -29,6 +29,9 @@ | |||
29 | - dtucker@cvs.openbsd.org 2013/06/10 21:56:43 | 29 | - dtucker@cvs.openbsd.org 2013/06/10 21:56:43 |
30 | [regress/forwarding.sh] | 30 | [regress/forwarding.sh] |
31 | Add test for forward config parsing | 31 | Add test for forward config parsing |
32 | - djm@cvs.openbsd.org 2013/06/21 02:26:26 | ||
33 | [regress/sftp-cmds.sh regress/test-exec.sh] | ||
34 | unbreak sftp-cmds for renamed test data (s/ls/data/) | ||
32 | 35 | ||
33 | 20130720 | 36 | 20130720 |
34 | - (djm) OpenBSD CVS Sync | 37 | - (djm) OpenBSD CVS Sync |
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh index ba5ef066d..aad7fcac2 100644 --- a/regress/sftp-cmds.sh +++ b/regress/sftp-cmds.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sftp-cmds.sh,v 1.13 2013/05/17 04:29:14 dtucker Exp $ | 1 | # $OpenBSD: sftp-cmds.sh,v 1.14 2013/06/21 02:26:26 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | # XXX - TODO: | 4 | # XXX - TODO: |
@@ -106,7 +106,7 @@ rm -f ${COPY}.dd/* | |||
106 | verbose "$tid: get to directory" | 106 | verbose "$tid: get to directory" |
107 | echo "get $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ | 107 | echo "get $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
108 | || fail "get failed" | 108 | || fail "get failed" |
109 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get" | 109 | cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after get" |
110 | 110 | ||
111 | rm -f ${COPY}.dd/* | 111 | rm -f ${COPY}.dd/* |
112 | verbose "$tid: glob get to directory" | 112 | verbose "$tid: glob get to directory" |
@@ -120,7 +120,7 @@ rm -f ${COPY}.dd/* | |||
120 | verbose "$tid: get to local dir" | 120 | verbose "$tid: get to local dir" |
121 | (echo "lcd ${COPY}.dd"; echo "get $DATA" ) | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ | 121 | (echo "lcd ${COPY}.dd"; echo "get $DATA" ) | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
122 | || fail "get failed" | 122 | || fail "get failed" |
123 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get" | 123 | cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after get" |
124 | 124 | ||
125 | rm -f ${COPY}.dd/* | 125 | rm -f ${COPY}.dd/* |
126 | verbose "$tid: glob get to local dir" | 126 | verbose "$tid: glob get to local dir" |
@@ -154,7 +154,7 @@ rm -f ${COPY}.dd/* | |||
154 | verbose "$tid: put to directory" | 154 | verbose "$tid: put to directory" |
155 | echo "put $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ | 155 | echo "put $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
156 | || fail "put failed" | 156 | || fail "put failed" |
157 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put" | 157 | cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after put" |
158 | 158 | ||
159 | rm -f ${COPY}.dd/* | 159 | rm -f ${COPY}.dd/* |
160 | verbose "$tid: glob put to directory" | 160 | verbose "$tid: glob put to directory" |
@@ -168,7 +168,7 @@ rm -f ${COPY}.dd/* | |||
168 | verbose "$tid: put to local dir" | 168 | verbose "$tid: put to local dir" |
169 | (echo "cd ${COPY}.dd"; echo "put $DATA") | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ | 169 | (echo "cd ${COPY}.dd"; echo "put $DATA") | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
170 | || fail "put failed" | 170 | || fail "put failed" |
171 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put" | 171 | cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after put" |
172 | 172 | ||
173 | rm -f ${COPY}.dd/* | 173 | rm -f ${COPY}.dd/* |
174 | verbose "$tid: glob put to local dir" | 174 | verbose "$tid: glob put to local dir" |
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 6e1c28c87..eee446264 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.45 2013/05/30 20:12:32 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.46 2013/06/21 02:26:26 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -167,7 +167,8 @@ SSH="$SSHLOGWRAP" | |||
167 | # Some test data. We make a copy because some tests will overwrite it. | 167 | # Some test data. We make a copy because some tests will overwrite it. |
168 | # The tests may assume that $DATA exists and is writable and $COPY does | 168 | # The tests may assume that $DATA exists and is writable and $COPY does |
169 | # not exist. | 169 | # not exist. |
170 | DATA=$OBJ/data | 170 | DATANAME=data |
171 | DATA=$OBJ/${DATANAME} | ||
171 | cat $SSHD $SSHD $SSHD $SSHD >${DATA} | 172 | cat $SSHD $SSHD $SSHD $SSHD >${DATA} |
172 | chmod u+w ${DATA} | 173 | chmod u+w ${DATA} |
173 | COPY=$OBJ/copy | 174 | COPY=$OBJ/copy |