X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/332cf6df7c32dbaa47cbfe515121da7bd53974e8..7462c6ac39d86cb8252ec47246569e3ddda35b6a:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index 15b3f424..b982461b 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,11 +239,12 @@ build_rsyncd_conf() { pid file = $pidfile use chroot = no -hosts allow = localhost 127.0.0.1 $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 -exclude = foobar.baz +exclude = ? foobar.baz max verbosity = 9 uid = 0 gid = 0 @@ -245,15 +252,40 @@ gid = 0 [test-from] path = $fromdir read only = yes + comment = r/o [test-to] path = $todir read only = no + comment = r/w [test-scratch] path = $scratchdir read only = no + +[test-hidden] + path = $fromdir + list = 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" }