Fix sh syntax for FreeBSD.

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

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index b3df524..a80a96c 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -66,13 +66,13 @@ checkit() {
     echo "-------------">>${log}
     echo "check how the files compare with diff:">>${log}
     echo "">>${log}
-    diff -ur $2 $3 >>${log} 2>&1 || failed=YES
+    diff -cr $2 $3 >>${log} 2>&1 || failed=YES
     echo "-------------">>${log}
     echo "check how the directory listings compare with diff:">>${log}
     echo "">>${log}
     ( cd $2 ; ls -laR ) > ${TMP}/ls-from 2>>${log}
     ( cd $3 ; ls -laR ) > ${TMP}/ls-to  2>>${log}
-    diff -u ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
+    diff -c ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
     if [ -z "${failed}" ] ; then
        echo "${ECHO_T} done."
        rm $log
@@ -100,3 +100,30 @@ checkforlogs() {
   fi
 }
 
+
+build_rsyncd_conf() {
+    # Build an appropriate configuration file
+    conf="$scratchdir/test-rsyncd.conf"
+    echo "building configuration $conf"
+
+    port=2612
+    pidfile="$scratchdir/rsyncd.pid"
+    logfile="$scratchdir/rsyncd.log"
+
+    cat >$conf <<EOF
+# rsyncd configuration file autogenerated by $0
+
+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
+EOF
+}
+
+