X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a3dcb7908532cdd5bd1657ac3374abab0875dc2d..90d5b12e7278a2bb9b01da4f18884e325e940696:/testsuite/itemize.test diff --git a/testsuite/itemize.test b/testsuite/itemize.test index 19937d9b..6237207f 100644 --- a/testsuite/itemize.test +++ b/testsuite/itemize.test @@ -12,15 +12,27 @@ set -x -itemregex='^[.<>ch][dfDL][c .+][s .+][tT .+][p .+][o .+][g .+][a .+] ' - 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" @@ -31,7 +43,7 @@ ln "$fromdir/foo/config1" "$fromdir/foo/extra" $RSYNC -iplr "$fromdir/" "$todir/" \ | tee "$outfile" -cat <"$chkfile" cd+++++++ bar/ cd+++++++ bar/baz/ >f+++++++ bar/baz/rsync @@ -41,20 +53,22 @@ cd+++++++ foo/ >f+++++++ foo/extra cL+++++++ foo/sym -> ../bar/baz/rsync EOT +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" -cat <"$chkfile" >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 -a -f '-! */' "$fromdir/" "$todir" sleep 1 # For directory mod below to ensure time difference @@ -68,34 +82,36 @@ 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 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/" \ - | sed -e '1,/done$/d' -e '/--whole-file/d' -e '/total:/d' -e '/^$/,$d' \ | tee "$outfile" -cat <"$chkfile" bar/baz/rsync is uptodate foo/config1 is uptodate foo/config2 "foo/extra" is a hard link foo/sym is uptodate EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed" chmod 747 "$todir/bar/baz/rsync" $RSYNC -a -f '-! */' "$fromdir/" "$todir" $RSYNC -ivvplrtH "$fromdir/" "$todir/" \ - | grep "$itemregex" \ | tee "$outfile" -cat <"$chkfile" .d ./ .d bar/ .d bar/baz/ @@ -106,52 +122,165 @@ cat < ../bar/baz/rsync EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed" chmod 757 "$todir/foo/config1" touch "$todir/foo/config2" $RSYNC -vplrtH "$fromdir/" "$todir/" \ - | sed -e '/done$/d' -e '/^$/,$d' \ | tee "$outfile" -cat <"$chkfile" foo/config2 EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed" chmod 757 "$todir/foo/config1" touch "$todir/foo/config2" $RSYNC -iplrtH "$fromdir/" "$todir/" \ | tee "$outfile" -cat <"$chkfile" .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/" \ - | grep "$itemregex" \ | tee "$outfile" -cat <"$chkfile" .d..t.... ./ cd+++++++ bar/ cd+++++++ bar/baz/ -cf....... bar/baz/rsync +cf bar/baz/rsync cd+++++++ foo/ -cf....... foo/config1 -cf....... foo/config2 -hf+++++++ foo/extra => foo/config1 -cL+++++++ foo/sym -> ../bar/baz/rsync +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/" \ + | tee "$outfile" +cat <"$chkfile" +.d..t.... ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cd+++++++ foo/ +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" +./ +bar/ +bar/baz/ +bar/baz/rsync is uptodate +foo/ +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" +.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" rm -rf "$todir" $RSYNC -iplrtH --link-dest="$lddir" "$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 EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed" + +rm -rf "$todir" +$RSYNC -vvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +filter_outfile +cat <"$chkfile" +./ +bar/ +bar/baz/ +bar/baz/rsync is uptodate +foo/ +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 13 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" +.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" + +rm -rf "$todir" +$RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +cat <"$chkfile" +.d..t.... ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cd+++++++ foo/ +EOT +diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed" + +rm -rf "$todir" +$RSYNC -vvplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ + | tee "$outfile" +filter_outfile +cat <"$chkfile" +./ +bar/ +bar/baz/ +bar/baz/rsync is uptodate +foo/ +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 16 failed" # The script would have aborted on error, so getting here means we've won. exit 0