X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0eb05245f1cf827d5275896095a3abcbfa84c1e2..9793bbb3646cbaa816d074dc925a4f4f7d40089f:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index b7795ce3..de628665 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -23,6 +23,11 @@ fromdir="$tmpdir/from" todir="$tmpdir/to" chkdir="$tmpdir/chk" +# For itemized output: +all_plus='+++++++++' +allspace=' ' +dots='.....' # trailing dots after changes + # Berkley's nice. PATH="$PATH:/usr/ucb" @@ -52,6 +57,7 @@ runtest() { # messages). This isn't needed if you use -i without -v. filter_outfile() { sed -e '/^building file list /d' \ + -e '/^sending incremental file list/d' \ -e '/^created directory /d' \ -e '/^done$/d' \ -e '/ --whole-file$/d' \ @@ -233,7 +239,8 @@ build_rsyncd_conf() { pid file = $pidfile use chroot = no -hosts allow = localhost 127.0.0.1 10.0.1.2 $hostname +munge symlinks = no +hosts allow = localhost 127.0.0.0/24 192.168.0.0/16 10.0.0.0/8 $hostname log file = $logfile log format = %i %h [%a] %m (%u) %l %f%L transfer logging = yes @@ -254,6 +261,25 @@ gid = 0 path = $scratchdir read only = no EOF + + # Build a helper script to ignore exit code 23 + ignore23="$scratchdir/ignore23" + echo "building help script $ignore23" + + cat >"$ignore23" <<'EOT' +if "${@}"; then + exit +fi + +ret=$? + +if test $ret = 23; then + exit +fi + +exit $ret +EOT +chmod +x "$ignore23" }