X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/165dd4a6367ac95282f46ab017159f6e852abdc2..c8d19f90a679343c92295e364e57fb3375c0a8e6:/testsuite/itemize.test diff --git a/testsuite/itemize.test b/testsuite/itemize.test index 6237207f..82fa4fcf 100644 --- a/testsuite/itemize.test +++ b/testsuite/itemize.test @@ -2,7 +2,7 @@ # Copyright (C) 2005 by Wayne Davison -# This program is distributable under the terms of the GNU GPL see +# This program is distributable under the terms of the GNU GPL (see # COPYING). # Test the output of various copy commands to ensure itemized output @@ -10,26 +10,11 @@ . "$suitedir/rsync.fns" -set -x - 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/configure.in" "$fromdir/foo/config1" @@ -44,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/extra" $RSYNC -iplr "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$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" @@ -63,10 +48,10 @@ chmod 601 "$fromdir/foo/config2" $RSYNC -iplrH "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$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" @@ -83,11 +68,11 @@ chmod 777 "$todir/bar/baz/rsync" $RSYNC -iplrtc "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$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" @@ -112,15 +97,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$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" @@ -139,8 +124,8 @@ touch "$todir/foo/config2" $RSYNC -iplrtH "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$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" @@ -149,15 +134,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$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" @@ -165,11 +150,11 @@ rm -rf "$todir" $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$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" @@ -196,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$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" @@ -212,10 +197,10 @@ rm -rf "$todir" $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$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" @@ -243,14 +228,14 @@ filter_outfile # 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 <"$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" @@ -258,10 +243,10 @@ rm -rf "$todir" $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$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"