diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/scp.sh | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -16,6 +16,9 @@ | |||
16 | - djm@cvs.openbsd.org 2004/06/13 15:16:54 | 16 | - djm@cvs.openbsd.org 2004/06/13 15:16:54 |
17 | [regress/test-exec.sh] | 17 | [regress/test-exec.sh] |
18 | remove duplicate setting of $SCP; spotted by markus@ | 18 | remove duplicate setting of $SCP; spotted by markus@ |
19 | - dtucker@cvs.openbsd.org 2004/06/16 13:15:09 | ||
20 | [regress/scp.sh] | ||
21 | Make scp -r tests use diff -rN not cmp (which won't do dirs. ok markus@ | ||
19 | - (dtucker) [regress/test-exec.sh] | 22 | - (dtucker) [regress/test-exec.sh] |
20 | Move Portable-only StrictModes to top of list to make syncs easier. | 23 | Move Portable-only StrictModes to top of list to make syncs easier. |
21 | - (dtucker) [regress/README.regress] | 24 | - (dtucker) [regress/README.regress] |
@@ -1245,4 +1248,4 @@ | |||
1245 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1248 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1246 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1249 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1247 | 1250 | ||
1248 | $Id: ChangeLog,v 1.3395 2004/06/16 11:08:32 dtucker Exp $ | 1251 | $Id: ChangeLog,v 1.3396 2004/06/16 13:22:37 dtucker Exp $ |
diff --git a/regress/scp.sh b/regress/scp.sh index 2d722c70c..cda01868a 100644 --- a/regress/scp.sh +++ b/regress/scp.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: scp.sh,v 1.1 2004/06/13 13:51:02 dtucker Exp $ | 1 | # $OpenBSD: scp.sh,v 1.2 2004/06/16 13:15:09 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="scp" | 4 | tid="scp" |
@@ -45,15 +45,17 @@ cmp ${COPY} ${DIR}/copy || fail "corrupted copy" | |||
45 | 45 | ||
46 | verbose "$tid: recursive local dir to remote dir" | 46 | verbose "$tid: recursive local dir to remote dir" |
47 | scpclean | 47 | scpclean |
48 | rm -rf ${DIR2} | ||
48 | cp ${DATA} ${DIR}/copy | 49 | cp ${DATA} ${DIR}/copy |
49 | $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" | 50 | $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" |
50 | cmp ${DIR} ${DIR2} || fail "corrupted copy" | 51 | diff -rN ${DIR} ${DIR2} || fail "corrupted copy" |
51 | 52 | ||
52 | verbose "$tid: recursive remote dir to local dir" | 53 | verbose "$tid: recursive remote dir to local dir" |
53 | scpclean | 54 | scpclean |
55 | rm -rf ${DIR2} | ||
54 | cp ${DATA} ${DIR}/copy | 56 | cp ${DATA} ${DIR}/copy |
55 | $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" | 57 | $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" |
56 | cmp ${DIR} ${DIR2} || fail "corrupted copy" | 58 | diff -rN ${DIR} ${DIR2} || fail "corrupted copy" |
57 | 59 | ||
58 | for i in 0 1 2 3 4; do | 60 | for i in 0 1 2 3 4; do |
59 | verbose "$tid: disallow bad server #$i" | 61 | verbose "$tid: disallow bad server #$i" |