set -x
-itemregex='^[.<>ch][dfDL][c .+][s .+][tT .+][p .+][o .+][g .+][a .+] '
-
lddir="$tmpdir/ld"
+chkfile="$scratchdir/rsync.chk"
outfile="$scratchdir/rsync.out"
+# This is only called if rsync was run with -v or -vv (not -i alone).
+# Higher levels of -v would require more filtering.
+filter_outfile() {
+ sed -e '/^building file list /d' \
+ -e '/^created directory /d' \
+ -e '/^done$/d' \
+ -e '/ --whole-file$/d' \
+ -e '/^total: /d' \
+ -e '/^$/,$d' \
+ <"$outfile" >"$outfile.new"
+ mv "$outfile.new" "$outfile"
+}
+
makepath "$fromdir/foo"
makepath "$fromdir/bar/baz"
-cp -p "$srcdir/config.h" "$fromdir/foo/config1"
+cp -p "$srcdir/configure.in" "$fromdir/foo/config1"
cp -p "$srcdir/config.h.in" "$fromdir/foo/config2"
cp -p "$srcdir/rsync.h" "$fromdir/bar/baz/rsync"
chmod 600 "$fromdir"/foo/config? "$fromdir/bar/baz/rsync"
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 1 failed"
+cat <<EOT >"$chkfile"
cd+++++++ bar/
cd+++++++ bar/baz/
>f+++++++ bar/baz/rsync
>f+++++++ foo/extra
cL+++++++ foo/sym -> ../bar/baz/rsync
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
# Ensure there are no accidental directory-time problems.
$RSYNC -a -f '-! */' "$fromdir/" "$todir"
-cp -p "$srcdir/config.h" "$fromdir/foo/config2"
+cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
chmod 601 "$fromdir/foo/config2"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 2 failed"
+cat <<EOT >"$chkfile"
>f..T.... bar/baz/rsync
>f..T.... foo/config1
>f.sTp... foo/config2
hf..T.... foo/extra => foo/config1
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
$RSYNC -a -f '-! */' "$fromdir/" "$todir"
sleep 1 # For directory mod below to ensure time difference
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 3 failed"
+cat <<EOT >"$chkfile"
.f..tp... bar/baz/rsync
.d..t.... foo/
.f..t.... foo/config1
>fcstp... foo/config2
cL..T.... foo/sym -> ../bar/baz/rsync
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
-cp -p "$srcdir/config.h" "$fromdir/foo/config2"
+cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
chmod 600 "$fromdir/foo/config2"
# Lack of -t is for unchanged hard-link stress-test!
$RSYNC -vvplrH "$fromdir/" "$todir/" \
- | sed -e '1,/done$/d' -e '/--whole-file/d' -e '/total:/d' -e '/^$/,$d' \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 4 failed"
+filter_outfile
+cat <<EOT >"$chkfile"
bar/baz/rsync is uptodate
foo/config1 is uptodate
foo/config2
"foo/extra" is a hard link
foo/sym is uptodate
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
chmod 747 "$todir/bar/baz/rsync"
$RSYNC -a -f '-! */' "$fromdir/" "$todir"
$RSYNC -ivvplrtH "$fromdir/" "$todir/" \
- | grep "$itemregex" \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 5 failed"
+filter_outfile
+cat <<EOT >"$chkfile"
.d ./
.d bar/
.d bar/baz/
hf foo/extra
.L foo/sym -> ../bar/baz/rsync
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
chmod 757 "$todir/foo/config1"
touch "$todir/foo/config2"
$RSYNC -vplrtH "$fromdir/" "$todir/" \
- | sed -e '/done$/d' -e '/^$/,$d' \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 6 failed"
+filter_outfile
+cat <<EOT >"$chkfile"
foo/config2
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed"
chmod 757 "$todir/foo/config1"
touch "$todir/foo/config2"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 7 failed"
+cat <<EOT >"$chkfile"
.f...p... foo/config1
>f..t.... foo/config2
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
mv "$todir" "$lddir"
$RSYNC -ivvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
- | grep "$itemregex" \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 8 failed"
+filter_outfile
+cat <<EOT >"$chkfile"
.d..t.... ./
cd+++++++ bar/
cd+++++++ bar/baz/
hf+++++++ foo/extra => foo/config1
cL+++++++ foo/sym -> ../bar/baz/rsync
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
rm -rf "$todir"
$RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 9 failed"
+cat <<EOT >"$chkfile"
.d..t.... ./
cd+++++++ bar/
cd+++++++ bar/baz/
hf+++++++ foo/extra => foo/config1
cL+++++++ foo/sym -> ../bar/baz/rsync
EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
# The script would have aborted on error, so getting here means we've won.
exit 0