Restore trailing newline character at the end of the file.

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

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 1bb23f9..cdc545a 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -24,6 +24,13 @@ 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"
 
@@ -102,13 +109,6 @@ hands_setup() {
 }
 
 
-hands_cleanup() {
-    rm -r "$TMP"
-}
-
-
-
-
 ####################
 # Many machines do not have "mkdir -p", so we have to build up long paths.
 # How boring.  
@@ -181,21 +181,6 @@ checkit() {
 }
 
 
-# In fact, we need a more general feature of capturing all stderr/log files,
-# and dumping them if something goes wrong.
-
-checkforlogs() {
-  # skip it if we're under debian-test
-  if test -n "${Debian}" ; then return 0 ; fi
-
-  if [ -f $1 -a -s $1 ] ; then
-       echo "Failures have occurred.  $1 follows:" >&2
-       cat $1 >&2
-       exit 1
-  fi
-}
-
-
 build_rsyncd_conf() {
     # Build an appropriate configuration file
     conf="$scratchdir/test-rsyncd.conf"
@@ -213,11 +198,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 = $RSYNCD_UID 
+gid = $RSYNCD_GID 
 
 [test-from]
        path = $FROM
@@ -275,6 +257,8 @@ do
        fi
    done
 done
+# ok, now get rid of it
+rm "$scratchdir/testlink"
 
 
 if [ "x$TEST_SYMLINK_CMD" = 'x' ]
@@ -298,4 +282,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