From: dtucker <dtucker@openbsd.org>
Date: Mon, 11 Dec 2017 11:41:56 +0000 (+0000)
Subject: use cmp in a loop instead of diff -N to compare directories. The former
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3f70af6ec60969b5c21db1954d0680ea3f1599f5;p=openbsd

use cmp in a loop instead of diff -N to compare directories. The former
works on more platforms for Portable.
---

diff --git a/regress/usr.bin/ssh/scp-uri.sh b/regress/usr.bin/ssh/scp-uri.sh
index bf21bf32ee5..c03d8bbe076 100644
--- a/regress/usr.bin/ssh/scp-uri.sh
+++ b/regress/usr.bin/ssh/scp-uri.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: scp-uri.sh,v 1.1 2017/10/24 19:33:32 millert Exp $
+#	$OpenBSD: scp-uri.sh,v 1.2 2017/12/11 11:41:56 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="scp-uri"
@@ -51,14 +51,18 @@ scpclean
 rm -rf ${DIR2}
 cp ${DATA} ${DIR}/copy
 $SCP $scpopts -r ${DIR} "scp://${USER}@somehost:${PORT}/${DIR2}" || fail "copy failed"
-diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
+for i in $(cd ${DIR} && echo *); do
+	cmp ${DIR}/$i ${DIR2}/$i || fail "corrupted copy"
+done
 
 verbose "$tid: recursive remote dir to local dir"
 scpclean
 rm -rf ${DIR2}
 cp ${DATA} ${DIR}/copy
 $SCP $scpopts -r "scp://${USER}@somehost:${PORT}/${DIR}" ${DIR2} || fail "copy failed"
-diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
+for i in $(cd ${DIR} && echo *); do
+	cmp ${DIR}/$i ${DIR2}/$i || fail "corrupted copy"
+done
 
 # TODO: scp -3