From: dtucker <dtucker>
Date: Tue, 7 Dec 2004 00:26:15 +0000 (+0000)
Subject:  - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test.
X-Git-Tag: V_4_0_P1~115
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/035436678fd4960c01dd3d1430f949a7b22b322c

 - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test.
---

diff --git a/ChangeLog b/ChangeLog
index a31351f0..0c1e20d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20041207
+ - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test.
+
 20041206
  - (dtucker) [TODO WARNING.RNG] Update to reflect current reality.  ok djm@
  - (dtucker) OpenBSD CVS Sync
diff --git a/regress/scp.sh b/regress/scp.sh
index 39e8af4c..c3034b6e 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -73,7 +73,7 @@ if [ ! -z "$SUDO" ]; then
 	chmod 660 ${DIR2}/copy
 	$SUDO chown root ${DIR2}/copy
 	$SCP -p $scpopts somehost:${DIR}/\* ${DIR2} >/dev/null 2>&1
-	diff -rN ${DIR} ${DIR2} || fail "corrupted copy"
+	diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
 	$SUDO rm ${DIR2}/copy
 fi