summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-12-07 11:26:15 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-12-07 11:26:15 +1100
commit641b34c72b8509283b04c7f78e1ef88f25b8cb9b (patch)
treefa5edcf8e77c435d18b5e82f2817d1cd849f8891
parentd028fea13a24c2728e00bba98e7ff73a0470792d (diff)
- (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test.
-rw-r--r--ChangeLog5
-rw-r--r--regress/scp.sh2
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 @@
120041207
2 - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test.
3
120041206 420041206
2 - (dtucker) [TODO WARNING.RNG] Update to reflect current reality. ok djm@ 5 - (dtucker) [TODO WARNING.RNG] Update to reflect current reality. ok djm@
3 - (dtucker) OpenBSD CVS Sync 6 - (dtucker) OpenBSD CVS Sync
@@ -1920,4 +1923,4 @@
1920 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1923 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1921 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1924 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1922 1925
1923$Id: ChangeLog,v 1.3598 2004/12/06 12:16:29 dtucker Exp $ 1926$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
73 chmod 660 ${DIR2}/copy 73 chmod 660 ${DIR2}/copy
74 $SUDO chown root ${DIR2}/copy 74 $SUDO chown root ${DIR2}/copy
75 $SCP -p $scpopts somehost:${DIR}/\* ${DIR2} >/dev/null 2>&1 75 $SCP -p $scpopts somehost:${DIR}/\* ${DIR2} >/dev/null 2>&1
76 diff -rN ${DIR} ${DIR2} || fail "corrupted copy" 76 diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy"
77 $SUDO rm ${DIR2}/copy 77 $SUDO rm ${DIR2}/copy
78fi 78fi
79 79