X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b33ce4c800683a9bd095f6f9f52eef118d8680f6..71cb9df386acebe1811ff1ef79249a6b6aaea78e:/testsuite/itemize.test diff --git a/testsuite/itemize.test b/testsuite/itemize.test index 5df176c8..1614fb94 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,8 +10,6 @@ . "$suitedir/rsync.fns" -set -x - lddir="$tmpdir/ld" chkfile="$scratchdir/rsync.chk" @@ -31,14 +29,15 @@ 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+++++++ ./ +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" @@ -50,10 +49,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" @@ -70,11 +69,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" @@ -99,15 +98,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" @@ -126,37 +125,37 @@ 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" mv "$todir" "$lddir" -$RSYNC -ivvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ +$RSYNC -ivvplrtH --copy-dest=../ld "$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 +cd+++++++ ./ +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" rm -rf "$todir" -$RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ +$RSYNC -iplrtH --copy-dest=../ld "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.d..t... ./ -cd++++++ bar/ -cd++++++ bar/baz/ -cd++++++ foo/ -hf foo/extra => foo/config1 +cd+++++++ ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cd+++++++ foo/ +hf foo/extra => foo/config1 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed" @@ -183,29 +182,40 @@ $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 +cd+++++++ ./ +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" rm -rf "$todir" -$RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ +$RSYNC -iplrtH --dry-run --link-dest=../ld "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.d..t... ./ -cd++++++ bar/ -cd++++++ bar/baz/ -cd++++++ foo/ +cd+++++++ ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cd+++++++ foo/ EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed" +rm -rf "$todir" +$RSYNC -iplrtH --link-dest=../ld "$fromdir/" "$todir/" \ + | tee "$outfile" +cat <"$chkfile" +cd+++++++ ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cd+++++++ foo/ +EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed" + rm -rf "$todir" $RSYNC -vvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" @@ -221,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/" \ @@ -230,27 +240,27 @@ 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 +cd+++++++ ./ +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" +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++++++ bar/ -cd++++++ bar/baz/ -cd++++++ foo/ +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/" \ @@ -267,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