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/configure.in" "$fromdir/foo/config1"
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-cd+++++++ bar/
-cd+++++++ bar/baz/
->f+++++++ bar/baz/rsync
-cd+++++++ foo/
->f+++++++ foo/config1
->f+++++++ foo/config2
->f+++++++ foo/extra
-cL+++++++ foo/sym -> ../bar/baz/rsync
+cd++++++ bar/
+cd++++++ bar/baz/
+>f++++++ bar/baz/rsync
+cd++++++ foo/
+>f++++++ foo/config1
+>f++++++ foo/config2
+>f++++++ foo/extra
+cL++++++ foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
->f..T.... bar/baz/rsync
->f..T.... foo/config1
->f.sTp... foo/config2
-hf..T.... foo/extra => foo/config1
+>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 -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
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
+.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"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-.d ./
-.d bar/
-.d bar/baz/
-.f...p... bar/baz/rsync
-.d foo/
-.f foo/config1
->f..t.... foo/config2
-hf foo/extra
-.L foo/sym -> ../bar/baz/rsync
+.d ./
+.d bar/
+.d bar/baz/
+.f...p.. bar/baz/rsync
+.d foo/
+.f foo/config1
+>f..t... foo/config2
+hf foo/extra
+.L foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.f...p... foo/config1
->f..t.... foo/config2
+.f...p.. foo/config1
+>f..t... foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cf bar/baz/rsync
-cd+++++++ foo/
-cf foo/config1
-cf foo/config2
-hf foo/extra => foo/config1
-cL..T.... foo/sym -> ../bar/baz/rsync
+.d..t... ./
+cd++++++ bar/
+cd++++++ bar/baz/
+cf bar/baz/rsync
+cd++++++ foo/
+cf foo/config1
+cf foo/config2
+hf foo/extra => foo/config1
+cL..T... foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
$RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
-hf foo/extra => foo/config1
+.d..t... ./
+cd++++++ bar/
+cd++++++ bar/baz/
+cd++++++ foo/
+hf foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-hf bar/baz/rsync
-cd+++++++ foo/
-hf foo/config1
-hf foo/config2
-hf foo/extra => foo/config1
-hL foo/sym -> ../bar/baz/rsync
+.d..t... ./
+cd++++++ bar/
+cd++++++ bar/baz/
+hf bar/baz/rsync
+cd++++++ foo/
+hf foo/config1
+hf foo/config2
+hf foo/extra => foo/config1
+hL foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
$RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+.d..t... ./
+cd++++++ bar/
+cd++++++ bar/baz/
+cd++++++ foo/
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
# TODO fix really-old problem when combining -H with --compare-dest:
# missing output for foo/extra hard-link (and it might not be updated)!
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-.f bar/baz/rsync
-cd+++++++ foo/
-.f foo/config1
-.f foo/config2
-.L foo/sym -> ../bar/baz/rsync
+.d..t... ./
+cd++++++ bar/
+cd++++++ bar/baz/
+.f bar/baz/rsync
+cd++++++ foo/
+.f foo/config1
+.f foo/config2
+.L foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
$RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+.d..t... ./
+cd++++++ bar/
+cd++++++ bar/baz/
+cd++++++ foo/
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"