X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3fedd74ba21c4dd9d64d384881271d19fc80dc47..4a7cb3e8a82c5b641ef4344a41af33847922f4c2:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 8729a4ab..a80a96cb 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -27,12 +27,14 @@ hands_setup() {
     # set up test data
     touch ${FROM}/empty
     mkdir ${FROM}/emptydir
-    ps ax > ${FROM}/pslist
+
+    # a few hundred lines of test
+    ls -lR / | head -200 > ${FROM}/filelist
 
     # This might fail on systems that don't have -n
     echo $ECHO_N "This file has no trailing lf$ECHO_C" > ${FROM}/nolf
     ln -s nolf ${FROM}/nolf-symlink
-    cat /etc/inittab /etc/services /etc/resolv.conf > ${FROM}/${F1}
+    cat $srcdir/*.c | head -2000 > ${FROM}/${F1}
     mkdir ${FROM}/dir
     cp ${FROM}/${F1} ${FROM}/dir
     mkdir ${FROM}/dir/subdir
@@ -64,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
@@ -83,3 +85,45 @@ checkit() {
     fi
 }
 
+
+# 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"
+    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
+}
+
+