summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2003-07-05 07:09:31 +0000
committerWayne Davison <wayned@samba.org>2003-07-05 07:09:31 +0000
commit7ca9250db01827ed80eabee1103212e2718a624a (patch)
treef8b7b663cd16959e39ba9340ff669a16c313c9bd /testsuite
parentaf7086c63f5f7b4a1a057e63165414ad99a610ce (diff)
downloadrsync-7ca9250db01827ed80eabee1103212e2718a624a.tar.gz
rsync-7ca9250db01827ed80eabee1103212e2718a624a.tar.bz2
rsync-7ca9250db01827ed80eabee1103212e2718a624a.zip
Changed "diff -u" back to "diff -c" (for portability).
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/rsync.fns4
-rw-r--r--testsuite/trimslash.test2
-rw-r--r--testsuite/wildmatch.test2
3 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 7cc7ad05..42b7b7ef 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -157,7 +157,7 @@ checkit() {
echo ""
for f in `cd "$2"; find . -type f -print `
do
- diff -u "$2"/"$f" "$3"/"$f" || failed=YES
+ diff -c "$2"/"$f" "$3"/"$f" || failed=YES
done
echo "-------------"
@@ -165,7 +165,7 @@ checkit() {
echo ""
( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from
( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to
- diff -u ${TMP}/ls-from ${TMP}/ls-to || failed=YES
+ diff -c ${TMP}/ls-from ${TMP}/ls-to || failed=YES
if [ -z "${failed}" ] ; then
return 0
else
diff --git a/testsuite/trimslash.test b/testsuite/trimslash.test
index b2b8855f..cf118407 100644
--- a/testsuite/trimslash.test
+++ b/testsuite/trimslash.test
@@ -15,7 +15,7 @@ set -x
"//a//" "////" \
"/Users/Wierd Macintosh Name/// Ooh, translucent plastic/" \
> "$scratchdir/slash.out"
-diff -u "$scratchdir/slash.out" - <<EOF
+diff -c "$scratchdir/slash.out" - <<EOF
/usr/local/bin
/usr/local/bin
/usr/local/bin
diff --git a/testsuite/wildmatch.test b/testsuite/wildmatch.test
index 5ef586bf..3366dd59 100644
--- a/testsuite/wildmatch.test
+++ b/testsuite/wildmatch.test
@@ -12,7 +12,7 @@
set -x
"$TOOLDIR/wildtest" >"$scratchdir/wild.out"
-diff -u "$scratchdir/wild.out" - <<EOF
+diff -c "$scratchdir/wild.out" - <<EOF
EOF
exit 0