Got rid of O_TEXT_STR and added code to strip '\r' from the end of the

[rsync/rsync.git] / testsuite / rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index cdc545a..0dab773 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -24,13 +24,6 @@ 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"
 
@@ -106,6 +99,10 @@ hands_setup() {
 
 #      echo testing head:
 #      ls -lR ${srcdir} | head -10 || echo failed
+
+    # sleep here to prevent a copy from being made within the
+    #  default --modify-window time on Cygwin
+    sleep 2
 }
 
 
@@ -198,8 +195,8 @@ use chroot = no
 hosts allow = localhost, 127.0.0.1
 log file = $logfile
 
-uid = $RSYNCD_UID 
-gid = $RSYNCD_GID 
+uid = 0
+gid = 0
 
 [test-from]
        path = $FROM