summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2017-12-11 11:41:56 +0000
committerDamien Miller <djm@mindrot.org>2017-12-19 16:19:18 +1100
commitf689adb7a370b5572612d88be9837ca9aea75447 (patch)
treefcbfc3025ac3cc0e989375912eb7713e8bc5a404 /regress
parent748dd8e5de332b24c40f4b3bbedb902acb048c98 (diff)
upstream commit
use cmp in a loop instead of diff -N to compare directories. The former works on more platforms for Portable. OpenBSD-Regress-ID: c3aa72807f9c488e8829a26ae50fe5bcc5b57099
Diffstat (limited to 'regress')
-rw-r--r--regress/scp-uri.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/regress/scp-uri.sh b/regress/scp-uri.sh
index bf21bf32e..c03d8bbe0 100644
--- a/regress/scp-uri.sh
+++ b/regress/scp-uri.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: scp-uri.sh,v 1.1 2017/10/24 19:33:32 millert Exp $ 1# $OpenBSD: scp-uri.sh,v 1.2 2017/12/11 11:41:56 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="scp-uri" 4tid="scp-uri"
@@ -51,14 +51,18 @@ scpclean
51rm -rf ${DIR2} 51rm -rf ${DIR2}
52cp ${DATA} ${DIR}/copy 52cp ${DATA} ${DIR}/copy
53$SCP $scpopts -r ${DIR} "scp://${USER}@somehost:${PORT}/${DIR2}" || fail "copy failed" 53$SCP $scpopts -r ${DIR} "scp://${USER}@somehost:${PORT}/${DIR2}" || fail "copy failed"
54diff -rN ${DIR} ${DIR2} || fail "corrupted copy" 54for i in $(cd ${DIR} && echo *); do
55 cmp ${DIR}/$i ${DIR2}/$i || fail "corrupted copy"
56done
55 57
56verbose "$tid: recursive remote dir to local dir" 58verbose "$tid: recursive remote dir to local dir"
57scpclean 59scpclean
58rm -rf ${DIR2} 60rm -rf ${DIR2}
59cp ${DATA} ${DIR}/copy 61cp ${DATA} ${DIR}/copy
60$SCP $scpopts -r "scp://${USER}@somehost:${PORT}/${DIR}" ${DIR2} || fail "copy failed" 62$SCP $scpopts -r "scp://${USER}@somehost:${PORT}/${DIR}" ${DIR2} || fail "copy failed"
61diff -rN ${DIR} ${DIR2} || fail "corrupted copy" 63for i in $(cd ${DIR} && echo *); do
64 cmp ${DIR}/$i ${DIR2}/$i || fail "corrupted copy"
65done
62 66
63# TODO: scp -3 67# TODO: scp -3
64 68