Fix sh syntax for FreeBSD.

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

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 40c9659..a80a96c 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -101,7 +101,7 @@ checkforlogs() {
 }
 
 
-function build_rsyncd_conf {
+build_rsyncd_conf() {
     # Build an appropriate configuration file
     conf="$scratchdir/test-rsyncd.conf"
     echo "building configuration $conf"
@@ -111,36 +111,19 @@ function build_rsyncd_conf {
     logfile="$scratchdir/rsyncd.log"
 
     cat >$conf <<EOF
-    # rsyncd configuration file autogenerated by $0
+# rsyncd configuration file autogenerated by $0
 
-    pid file = $pidfile
-    use chroot = no
-    hosts allow = localhost, 127.0.0.1
-    log file = $logfile
+pid file = $pidfile
+use chroot = no
+hosts allow = localhost, 127.0.0.1
+log file = $logfile
 
-    [test-from] = $scratchdir/daemon-from/
-           read only = yes
-
-    [test-to] = $scratchdir/daemon-to/
-           read only = no
+[test-from] = $scratchdir/daemon-from/
+       read only = yes
 
+[test-to] = $scratchdir/daemon-to/
+       read only = no
 EOF
 }
 
 
-
-function start_rsyncd {
-    echo starting daemon
-    $rsync_bin --daemon --port $port --config $conf
-    sleep 2
-    pid=`cat "$pidfile"`
-    echo rsyncd running as process $pid
-
-
-    # We need to make sure that we always kill rsync, even if there's an
-    # error.  Otherwise it might hang around, and be insecure or at any
-    # rate keep the port bound and prevent the tests running in the
-    # future.
-
-    trap "echo killing off process $pid; kill $pid" EXIT
-}