summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-16 23:22:37 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-16 23:22:37 +1000
commit6f0e35b5664b34423f64da2c8dfd876a61888d6d (patch)
tree63b51bbade81ae0fb3c0043ffe11c7542db72e50 /regress
parent7a06f62b6a211f1257d9284995ac72f3adfa743c (diff)
- 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@
Diffstat (limited to 'regress')
-rw-r--r--regress/scp.sh8
1 files changed, 5 insertions, 3 deletions
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
4tid="scp" 4tid="scp"
@@ -45,15 +45,17 @@ cmp ${COPY} ${DIR}/copy || fail "corrupted copy"
45 45
46verbose "$tid: recursive local dir to remote dir" 46verbose "$tid: recursive local dir to remote dir"
47scpclean 47scpclean
48rm -rf ${DIR2}
48cp ${DATA} ${DIR}/copy 49cp ${DATA} ${DIR}/copy
49$SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" 50$SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed"
50cmp ${DIR} ${DIR2} || fail "corrupted copy" 51diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
51 52
52verbose "$tid: recursive remote dir to local dir" 53verbose "$tid: recursive remote dir to local dir"
53scpclean 54scpclean
55rm -rf ${DIR2}
54cp ${DATA} ${DIR}/copy 56cp ${DATA} ${DIR}/copy
55$SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" 57$SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed"
56cmp ${DIR} ${DIR2} || fail "corrupted copy" 58diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
57 59
58for i in 0 1 2 3 4; do 60for i in 0 1 2 3 4; do
59 verbose "$tid: disallow bad server #$i" 61 verbose "$tid: disallow bad server #$i"