X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/cca4e06786513f63dbf67835d8fba2c15d6f8d4c..d3e6fd39108f68f75ca6cca39a787269865a5358:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index c5532b56..7cc7ad05 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 -c "$2"/"$f" "$3"/"$f" || failed=YES
+        diff -u "$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 -c ${TMP}/ls-from ${TMP}/ls-to || failed=YES
+    diff -u ${TMP}/ls-from ${TMP}/ls-to || failed=YES
     if [ -z "${failed}" ] ; then
 	return 0
     else
@@ -191,11 +191,8 @@ use chroot = no
 hosts allow = localhost, 127.0.0.1
 log file = $logfile
 
-# We don't know if this machine has "nobody" or "nogroup", so use the quasi-canonical
-# values of (uint16_t) -2. 
-
-uid = 65534
-gid = 65534
+uid = 0
+gid = 0
 
 [test-from]
 	path = $FROM
@@ -278,4 +275,4 @@ is_a_link() {
 # best thing is probably to explicitly chmod those directories after
 # creation.
  
-umask 022
\ No newline at end of file
+umask 022