From 641b34c72b8509283b04c7f78e1ef88f25b8cb9b Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 7 Dec 2004 11:26:15 +1100 Subject: - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test. --- ChangeLog | 5 ++++- regress/scp.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 162890ec5..d2a382e9c 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 @@ -1920,4 +1923,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.3598 2004/12/06 12:16:29 dtucker Exp $ +$Id: ChangeLog,v 1.3599 2004/12/07 00:26:15 dtucker Exp $ diff --git a/regress/scp.sh b/regress/scp.sh index 39e8af4c6..c3034b6e7 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 -- cgit v1.2.3