X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/eace352b3936baf57185faee6a02ca42964423fb..043ef55b227146d2482859c66573b3229042ee75:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 73e36eed..b7795ce3 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -56,6 +56,8 @@ filter_outfile() {
 	-e '/^done$/d' \
 	-e '/ --whole-file$/d' \
 	-e '/^total: /d' \
+	-e '/^client charset: /d' \
+	-e '/^server charset: /d' \
 	-e '/^$/,$d' \
 	<"$outfile" >"$outfile.new"
     mv "$outfile.new" "$outfile"
@@ -66,7 +68,7 @@ printmsg() {
 }
 
 rsync_ls_lR() {
-    find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
+    find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
 }
 
 check_perms() {
@@ -144,17 +146,17 @@ hands_setup() {
 ####################
 # Many machines do not have "mkdir -p", so we have to build up long paths.
 # How boring.  
-makepath () {
-    echo "        makepath $1"
-    p="$1"
-    (
+makepath() {
+    for p in "${@}"; do
+	(echo "        makepath $p"
+
 	# Absolut Unix.
 	if echo $p | grep '^/' >/dev/null
 	then
 	    cd /
 	fi
     
-	# This will break if $1 contains a space.
+	# This will break if $p contains a space.
 	for c in `echo $p | tr '/' ' '`
 	do 
 	    if [ -d "$c" ] || mkdir "$c" 
@@ -163,8 +165,8 @@ makepath () {
 	    else
 		echo "failed to create $c" >&2; return $?
 	    fi
-	done
-    )
+	done)
+    done
 }
 
 
@@ -224,17 +226,19 @@ build_rsyncd_conf() {
     port=2612
     pidfile="$scratchdir/rsyncd.pid"
     logfile="$scratchdir/rsyncd.log"
+    hostname=`uname -n`
 
     cat >"$conf" <<EOF
 # rsyncd configuration file autogenerated by $0
 
 pid file = $pidfile
 use chroot = no
-hosts allow = localhost, 127.0.0.1
+hosts allow = localhost 127.0.0.1 10.0.1.2 $hostname
 log file = $logfile
+log format = %i %h [%a] %m (%u) %l %f%L
+transfer logging = yes
 exclude = foobar.baz
 max verbosity = 9
-
 uid = 0
 gid = 0
 
@@ -245,6 +249,10 @@ gid = 0
 [test-to]
 	path = $todir
 	read only = no
+
+[test-scratch]
+	path = $scratchdir
+	read only = no
 EOF
 }