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 @@ - djm@cvs.openbsd.org 2004/06/13 15:16:54 [regress/test-exec.sh] remove duplicate setting of $SCP; spotted by markus@ + - dtucker@cvs.openbsd.org 2004/06/16 13:15:09 + [regress/scp.sh] + Make scp -r tests use diff -rN not cmp (which won't do dirs. ok markus@ - (dtucker) [regress/test-exec.sh] Move Portable-only StrictModes to top of list to make syncs easier. - (dtucker) [regress/README.regress] @@ -1245,4 +1248,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3395 2004/06/16 11:08:32 dtucker Exp $ +$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 @@ -# $OpenBSD: scp.sh,v 1.1 2004/06/13 13:51:02 dtucker Exp $ +# $OpenBSD: scp.sh,v 1.2 2004/06/16 13:15:09 dtucker Exp $ # Placed in the Public Domain. tid="scp" @@ -45,15 +45,17 @@ cmp ${COPY} ${DIR}/copy || fail "corrupted copy" verbose "$tid: recursive local dir to remote dir" scpclean +rm -rf ${DIR2} cp ${DATA} ${DIR}/copy $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" -cmp ${DIR} ${DIR2} || fail "corrupted copy" +diff -rN ${DIR} ${DIR2} || fail "corrupted copy" verbose "$tid: recursive remote dir to local dir" scpclean +rm -rf ${DIR2} cp ${DATA} ${DIR}/copy $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" -cmp ${DIR} ${DIR2} || fail "corrupted copy" +diff -rN ${DIR} ${DIR2} || fail "corrupted copy" for i in 0 1 2 3 4; do verbose "$tid: disallow bad server #$i" |