X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/165dd4a6367ac95282f46ab017159f6e852abdc2..76e0a49efe6a5ce4ecdb4d74eb1f2301aa31345c:/testsuite/itemize.test

diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 6237207f..a165fa17 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -2,7 +2,7 @@
 
 # Copyright (C) 2005 by Wayne Davison <wayned@samba.org>
 
-# 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,20 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
+case "$RSYNC" in
+*protocol=29*)
+    sed_cmd='/_P30_/d; s/_P29_//'
+    ;;
+*)
+    sed_cmd='/_P29_/d; s/_P30_//'
+    ;;
+esac
 
-lddir="$tmpdir/ld"
+to2dir="$tmpdir/to2"
 
 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"
@@ -41,13 +35,24 @@ 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 -s no-such-dir "$to2dir"
+if ln "$to2dir" "$to2dir.test" 2>/dev/null; then
+    L=hL
+else
+    L=cL
+fi
+rm -f "$to2dir" "$to2dir.test"
+
 $RSYNC -iplr "$fromdir/" "$todir/" \
     | tee "$outfile"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+cd+++++++ ./
 cd+++++++ bar/
+cd+++++++ foo/_P30_
 cd+++++++ bar/baz/
 >f+++++++ bar/baz/rsync
-cd+++++++ foo/
+cd+++++++ foo/_P29_
 >f+++++++ foo/config1
 >f+++++++ foo/config2
 >f+++++++ foo/extra
@@ -62,7 +67,7 @@ cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
 chmod 601 "$fromdir/foo/config2"
 $RSYNC -iplrH "$fromdir/" "$todir/" \
     | tee "$outfile"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 >f..T.... bar/baz/rsync
 >f..T.... foo/config1
 >f.sTp... foo/config2
@@ -82,9 +87,10 @@ chmod 777 "$todir/bar/baz/rsync"
 
 $RSYNC -iplrtc "$fromdir/" "$todir/" \
     | tee "$outfile"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+.d..t.... foo/_P30_
 .f..tp... bar/baz/rsync
-.d..t.... foo/
+.d..t.... foo/_P29_
 .f..t.... foo/config1
 >fcstp... foo/config2
 cL..T.... foo/sym -> ../bar/baz/rsync
@@ -97,11 +103,11 @@ chmod 600 "$fromdir/foo/config2"
 $RSYNC -vvplrH "$fromdir/" "$todir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 bar/baz/rsync is uptodate
 foo/config1 is uptodate
 foo/config2
-"foo/extra" is a hard link
+foo/extra is uptodate
 foo/sym is uptodate
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
@@ -111,7 +117,7 @@ $RSYNC -a -f '-! */' "$fromdir/" "$todir"
 $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 .d        ./
 .d        bar/
 .d        bar/baz/
@@ -129,7 +135,7 @@ touch "$todir/foo/config2"
 $RSYNC -vplrtH "$fromdir/" "$todir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 foo/config2
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed"
@@ -138,149 +144,141 @@ chmod 757 "$todir/foo/config1"
 touch "$todir/foo/config2"
 $RSYNC -iplrtH "$fromdir/" "$todir/" \
     | tee "$outfile"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$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/" \
+$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+cd        ./
+cd        bar/
+cd        bar/baz/
 cf        bar/baz/rsync
-cd+++++++ foo/
+cd        foo/
 cf        foo/config1
 cf        foo/config2
 hf        foo/extra => foo/config1
-cL..T.... foo/sym -> ../bar/baz/rsync
+cL        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/" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
-cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 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/" \
+rm -rf "$to2dir"
+$RSYNC -vvplrtH --copy-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+./ is uptodate
+bar/ is uptodate
+bar/baz/ is uptodate
 bar/baz/rsync is uptodate
-foo/
+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/" \
+rm -rf "$to2dir"
+$RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+cd        ./
+cd        bar/
+cd        bar/baz/
 hf        bar/baz/rsync
-cd+++++++ foo/
+cd        foo/
 hf        foo/config1
 hf        foo/config2
 hf        foo/extra => foo/config1
-hL        foo/sym -> ../bar/baz/rsync
+$L        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/" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
-cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
 
-rm -rf "$todir"
-$RSYNC -vvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --link-dest=../to "$fromdir/" "$to2dir/" \
+    | tee "$outfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
+
+rm -rf "$to2dir"
+$RSYNC -vvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+./ is uptodate
+bar/ is uptodate
+bar/baz/ is uptodate
 bar/baz/rsync is uptodate
-foo/
+foo/ is uptodate
 foo/config1 is uptodate
 foo/config2 is uptodate
-"foo/extra" is a hard link
+foo/extra is uptodate
 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/" \
+rm -rf "$to2dir"
+$RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
     | 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 <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+cd        ./
+cd        bar/
+cd        bar/baz/
 .f        bar/baz/rsync
-cd+++++++ foo/
+cd        foo/
 .f        foo/config1
 .f        foo/config2
+.f        foo/extra
 .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/" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
-cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 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/" \
+rm -rf "$to2dir"
+$RSYNC -vvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+./ is uptodate
+bar/ is uptodate
+bar/baz/ is uptodate
 bar/baz/rsync is uptodate
-foo/
+foo/ is uptodate
 foo/config1 is uptodate
 foo/config2 is uptodate
-"foo/extra" is a hard link
+foo/extra is uptodate
 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