X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/34db05b4215009a1b9864df13ea3b62a6b9c5527..eddeaf76f8df1344b3918f17ac8e9639b63f94f2:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index cdc545a7..396cee69 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -24,16 +24,15 @@ TO=${TMP}/to
 LOG=${TMP}/log
 RSYNC="$rsync_bin"
 
-# UID & GID to run rsyncd as if testsuite is running as root
-#
-# We don't know if this machine has "nobody" or "nogroup", so use the
-# quasi-canonical values of (uint16_t) -2.
-RSYNCD_UID=65534
-RSYNCD_GID=65534
-
 # Berkley's nice.
 PATH="$PATH:/usr/ucb"
 
+if diff -u $srcdir/testsuite/rsync.fns $srcdir/testsuite/rsync.fns >/dev/null 2>&1; then
+    diffopt="-u"
+else
+    diffopt="-c"
+fi
+
 runtest() {
     echo $ECHO_N "Test $1: $ECHO_C"
     if eval "$2"
@@ -164,7 +163,7 @@ checkit() {
     echo ""
     for f in `cd "$2"; find . -type f -print `
     do 
-        diff -c "$2"/"$f" "$3"/"$f" || failed=YES
+        diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
     done
 
     echo "-------------"
@@ -172,7 +171,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 $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES
     if [ -z "${failed}" ] ; then
 	return 0
     else
@@ -197,9 +196,10 @@ pid file = $pidfile
 use chroot = no
 hosts allow = localhost, 127.0.0.1
 log file = $logfile
+max verbosity = 9
 
-uid = $RSYNCD_UID 
-gid = $RSYNCD_GID 
+uid = 0
+gid = 0
 
 [test-from]
 	path = $FROM