X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/db3ae95cacce2aa0ffd8a43edddd1a8789c474e4..2dc7b8bd0e8d4a2d91334b9bb458df146b1700e8:/testsuite/itemize.test diff --git a/testsuite/itemize.test b/testsuite/itemize.test index ca369eeb..1614fb94 100644 --- a/testsuite/itemize.test +++ b/testsuite/itemize.test @@ -29,6 +29,7 @@ ln "$fromdir/foo/config1" "$fromdir/foo/extra" $RSYNC -iplr "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" +cd+++++++ ./ cd+++++++ bar/ cd+++++++ bar/baz/ >f+++++++ bar/baz/rsync @@ -134,7 +135,7 @@ $RSYNC -ivvplrtH --copy-dest=../ld "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -.d..t.... ./ +cd+++++++ ./ cd+++++++ bar/ cd+++++++ bar/baz/ cf bar/baz/rsync @@ -150,7 +151,7 @@ rm -rf "$todir" $RSYNC -iplrtH --copy-dest=../ld "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.d..t.... ./ +cd+++++++ ./ cd+++++++ bar/ cd+++++++ bar/baz/ cd+++++++ foo/ @@ -181,7 +182,7 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -.d..t.... ./ +cd+++++++ ./ cd+++++++ bar/ cd+++++++ bar/baz/ hf bar/baz/rsync @@ -208,12 +209,12 @@ rm -rf "$todir" $RSYNC -iplrtH --link-dest=../ld "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.d..t.... ./ +cd+++++++ ./ cd+++++++ bar/ cd+++++++ bar/baz/ cd+++++++ foo/ EOT -diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed" +diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed" rm -rf "$todir" $RSYNC -vvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ @@ -230,7 +231,7 @@ foo/config2 is uptodate "foo/extra" is a hard link foo/sym is uptodate EOT -diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed" +diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed" rm -rf "$todir" $RSYNC -ivvplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ @@ -239,7 +240,7 @@ 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+++++++ ./ cd+++++++ bar/ cd+++++++ bar/baz/ .f bar/baz/rsync @@ -248,18 +249,18 @@ cd+++++++ foo/ .f foo/config2 .L foo/sym -> ../bar/baz/rsync EOT -diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed" +diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed" rm -rf "$todir" $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.d..t.... ./ +cd+++++++ ./ cd+++++++ bar/ cd+++++++ bar/baz/ cd+++++++ foo/ EOT -diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed" +diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed" rm -rf "$todir" $RSYNC -vvplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ @@ -276,7 +277,7 @@ foo/config2 is uptodate "foo/extra" is a hard link foo/sym is uptodate EOT -diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed" +diff $diffopt "$chkfile" "$outfile" || test_fail "test 17 failed" # The script would have aborted on error, so getting here means we've won. exit 0