Changed "diff -u" back to "diff -c" (for portability).

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 7cc7ad0..42b7b7e 100644 (file)
--- 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 b2b8855..cf11840 100644 (file)
--- 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 5ef586b..3366dd5 100644 (file)
--- 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