diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-06-17 15:18:32 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-17 15:18:32 +1000 |
commit | 8a2f1b353760922bc7336f7c4030e192e13dc018 (patch) | |
tree | 0b155e6ebadc874dcccb8d453722ab340f976420 | |
parent | af16154b00b7f4cd935000f7b4f673e4c7795fb6 (diff) |
- (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some
platforms), so test if diff understands it. Pointed out by tim@, ok djm@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | regress/scp.sh | 11 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20040617 | ||
2 | - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some | ||
3 | platforms), so test if diff understands it. Pointed out by tim@, ok djm@ | ||
4 | |||
1 | 20040616 | 5 | 20040616 |
2 | - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No | 6 | - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No |
3 | code changes. | 7 | code changes. |
@@ -1251,4 +1255,4 @@ | |||
1251 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1255 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1252 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1256 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1253 | 1257 | ||
1254 | $Id: ChangeLog,v 1.3398 2004/06/16 13:24:19 dtucker Exp $ | 1258 | $Id: ChangeLog,v 1.3399 2004/06/17 05:18:32 dtucker Exp $ |
diff --git a/regress/scp.sh b/regress/scp.sh index cda01868a..703cc0893 100644 --- a/regress/scp.sh +++ b/regress/scp.sh | |||
@@ -5,6 +5,13 @@ tid="scp" | |||
5 | 5 | ||
6 | #set -x | 6 | #set -x |
7 | 7 | ||
8 | # Figure out if diff understands "-N" | ||
9 | if diff -N ${SRC}/scp.sh ${SRC}/scp.sh 2>/dev/null; then | ||
10 | DIFFOPT="-rN" | ||
11 | else | ||
12 | DIFFOPT="-r" | ||
13 | fi | ||
14 | |||
8 | DATA=/bin/ls | 15 | DATA=/bin/ls |
9 | COPY=${OBJ}/copy | 16 | COPY=${OBJ}/copy |
10 | COPY2=${OBJ}/copy2 | 17 | COPY2=${OBJ}/copy2 |
@@ -48,14 +55,14 @@ scpclean | |||
48 | rm -rf ${DIR2} | 55 | rm -rf ${DIR2} |
49 | cp ${DATA} ${DIR}/copy | 56 | cp ${DATA} ${DIR}/copy |
50 | $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" | 57 | $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" |
51 | diff -rN ${DIR} ${DIR2} || fail "corrupted copy" | 58 | diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" |
52 | 59 | ||
53 | verbose "$tid: recursive remote dir to local dir" | 60 | verbose "$tid: recursive remote dir to local dir" |
54 | scpclean | 61 | scpclean |
55 | rm -rf ${DIR2} | 62 | rm -rf ${DIR2} |
56 | cp ${DATA} ${DIR}/copy | 63 | cp ${DATA} ${DIR}/copy |
57 | $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" | 64 | $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" |
58 | diff -rN ${DIR} ${DIR2} || fail "corrupted copy" | 65 | diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" |
59 | 66 | ||
60 | for i in 0 1 2 3 4; do | 67 | for i in 0 1 2 3 4; do |
61 | verbose "$tid: disallow bad server #$i" | 68 | verbose "$tid: disallow bad server #$i" |