X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8af1bc9011254c054053bfdeee6d255179dd3afa..3b8ed84245622d9dc04f4d09d8fa7619bd5829b3:/testsuite/itemize.test diff --git a/testsuite/itemize.test b/testsuite/itemize.test index ce7492d2..06b73fa8 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,29 +10,14 @@ . "$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/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" @@ -41,9 +26,14 @@ ln -s ../bar/baz/rsync "$fromdir/foo/sym" umask 022 ln "$fromdir/foo/config1" "$fromdir/foo/extra" +# Check if the OS can hard-link symlinks or not +ln "$fromdir/foo/sym" "$fromdir/foo/sym.test" && L=hL || L=cL +rm -f "$fromdir/foo/sym.test" + $RSYNC -iplr "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" +cd+++++++ ./ cd+++++++ bar/ cd+++++++ bar/baz/ >f+++++++ bar/baz/rsync @@ -58,7 +48,7 @@ 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" @@ -91,7 +81,7 @@ 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/" \ @@ -145,34 +135,137 @@ 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+++++++ 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 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/" \ +$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 -cL+++++++ foo/sym -> ../bar/baz/rsync +hf foo/extra => foo/config1 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed" +rm -rf "$todir" +$RSYNC -vvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +filter_outfile +cat <"$chkfile" +./ is uptodate +bar/ is uptodate +bar/baz/ is uptodate +bar/baz/rsync is uptodate +foo/ is uptodate +foo/config1 is uptodate +foo/config2 is uptodate +"foo/extra" is a hard link +foo/extra => foo/config1 +foo/sym is uptodate +EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 10 failed" + +rm -rf "$todir" +$RSYNC -ivvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +filter_outfile +cat <"$chkfile" +cd ./ +cd bar/ +cd bar/baz/ +hf bar/baz/rsync +cd foo/ +hf foo/config1 +hf foo/config2 +hf foo/extra => foo/config1 +$L foo/sym -> ../bar/baz/rsync +EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed" + +rm -rf "$todir" +$RSYNC -iplrtH --dry-run --link-dest=../ld "$fromdir/" "$todir/" \ + | tee "$outfile" +cat <"$chkfile" +EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed" + +rm -rf "$todir" +$RSYNC -iplrtH --link-dest=../ld "$fromdir/" "$todir/" \ + | tee "$outfile" +cat <"$chkfile" +EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed" + +rm -rf "$todir" +$RSYNC -vvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +filter_outfile +cat <"$chkfile" +./ is uptodate +bar/ is uptodate +bar/baz/ is uptodate +bar/baz/rsync is uptodate +foo/ is uptodate +foo/config1 is uptodate +foo/config2 is uptodate +"foo/extra" is a hard link +foo/sym is uptodate +EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed" + +rm -rf "$todir" +$RSYNC -ivvplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +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" +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 15 failed" + +rm -rf "$todir" +$RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +cat <"$chkfile" +EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed" + +rm -rf "$todir" +$RSYNC -vvplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +filter_outfile +cat <"$chkfile" +./ is uptodate +bar/ is uptodate +bar/baz/ is uptodate +bar/baz/rsync is uptodate +foo/ is uptodate +foo/config1 is uptodate +foo/config2 is uptodate +"foo/extra" is a hard link +foo/sym is uptodate +EOT +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