X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a3dcb7908532cdd5bd1657ac3374abab0875dc2d..717d04669a3e07c2999e4d6221cbfd4a5eec2ec2:/testsuite/itemize.test

diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 19937d9b..0b7300c2 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,17 +10,14 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
-itemregex='^[.<>ch][dfDL][c .+][s .+][tT .+][p .+][o .+][g .+][a .+] '
-
-lddir="$tmpdir/ld"
+to2dir="$tmpdir/to2"
 
+chkfile="$scratchdir/rsync.chk"
 outfile="$scratchdir/rsync.out"
 
 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"
@@ -29,32 +26,59 @@ 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.
+# (Note: the link we check MUST NOT point to a valid file!)
+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"
+
+# Check if rsync can preserve time on symlinks
+case "$RSYNC" in
+*protocol=2*)
+    T=.T
+    ;;
+*)
+    if $RSYNC --version | grep ", symtimes" >/dev/null; then
+	T=.t
+    else
+	T=.T
+    fi
+    ;;
+esac
+
 $RSYNC -iplr "$fromdir/" "$todir/" \
     | tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 1 failed"
-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
+cat <<EOT >"$chkfile"
+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"
 
 # 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 <<EOT | diff $diffopt - "$outfile" || test_fail "test 2 failed"
->f..T.... bar/baz/rsync
->f..T.... foo/config1
->f.sTp... foo/config2
-hf..T.... foo/extra => foo/config1
+cat <<EOT >"$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,90 +92,212 @@ chmod 777 "$todir/bar/baz/rsync"
 
 $RSYNC -iplrtc "$fromdir/" "$todir/" \
     | tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 3 failed"
-.f..tp... bar/baz/rsync
-.d..t.... foo/
-.f..t.... foo/config1
->fcstp... foo/config2
-cL..T.... foo/sym -> ../bar/baz/rsync
+cat <<EOT >"$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 <<EOT | diff $diffopt - "$outfile" || test_fail "test 4 failed"
+filter_outfile
+cat <<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"
 
 chmod 747 "$todir/bar/baz/rsync"
 $RSYNC -a -f '-! */' "$fromdir/" "$todir"
 $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
-    | grep "$itemregex" \
     | tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 5 failed"
-.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
+filter_outfile
+cat <<EOT >"$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
 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 <<EOT | diff $diffopt - "$outfile" || test_fail "test 6 failed"
+filter_outfile
+cat <<EOT >"$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 <<EOT | diff $diffopt - "$outfile" || test_fail "test 7 failed"
-.f...p... foo/config1
->f..t.... foo/config2
+cat <<EOT >"$chkfile"
+.f...p..... foo/config1
+>f..t...... foo/config2
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
+
+$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
+    | tee "$outfile"
+filter_outfile
+case `tail -1 "$outfile"` in
+cL..t*)
+    sym_dots='..t......'
+    L_sym_dots='cL..t......'
+    is_uptodate='-> ../bar/baz/rsync'
+    echo "cL$sym_dots foo/sym $is_uptodate" >"$chkfile.extra"
+    L=cL
+    ;;
+*)
+    sym_dots='         '
+    L_sym_dots='.L         '
+    is_uptodate='is uptodate'
+    touch "$chkfile.extra"
+    ;;
+esac
+cat <<EOT >"$chkfile"
+cd          ./
+cd          bar/
+cd          bar/baz/
+cf          bar/baz/rsync
+cd          foo/
+cf          foo/config1
+cf          foo/config2
+hf          foo/extra => foo/config1
+cL$sym_dots foo/sym -> ../bar/baz/rsync
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
+
+rm -rf "$to2dir"
+$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
+    | tee "$outfile"
+cat - "$chkfile.extra" <<EOT >"$chkfile"
+hf          foo/extra => foo/config1
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
+
+rm -rf "$to2dir"
+$RSYNC -vvplrtH --copy-dest="$todir" "$fromdir/" "$to2dir/" \
+    | tee "$outfile"
+filter_outfile
+cat <<EOT >"$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 => foo/config1
+foo/sym $is_uptodate
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 10 failed"
+
+rm -rf "$to2dir"
+$RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
+    | tee "$outfile"
+filter_outfile
+cat <<EOT >"$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$sym_dots foo/sym -> ../bar/baz/rsync
 EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
 
-mv "$todir" "$lddir"
-$RSYNC -ivvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
-    | grep "$itemregex" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 8 failed"
-.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
+cat - "$chkfile.extra" <<EOT >"$chkfile"
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
+
+rm -rf "$to2dir"
+$RSYNC -iplrtH --link-dest=../to "$fromdir/" "$to2dir/" \
+    | tee "$outfile"
+cat - "$chkfile.extra" <<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"
+./ 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 uptodate
+foo/sym $is_uptodate
 EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
 
-rm -rf "$todir"
-$RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+rm -rf "$to2dir"
+$RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
-cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 9 failed"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
-hf+++++++ foo/extra => foo/config1
-cL+++++++ foo/sym -> ../bar/baz/rsync
+filter_outfile
+cat <<EOT >"$chkfile"
+cd          ./
+cd          bar/
+cd          bar/baz/
+.f          bar/baz/rsync
+cd          foo/
+.f          foo/config1
+.f          foo/config2
+.f          foo/extra
+$L_sym_dots foo/sym -> ../bar/baz/rsync
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
+
+rm -rf "$to2dir"
+$RSYNC -iplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
+    | tee "$outfile"
+cat - "$chkfile.extra" <<EOT >"$chkfile"
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
+
+rm -rf "$to2dir"
+$RSYNC -vvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
+    | tee "$outfile"
+filter_outfile
+cat <<EOT >"$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 uptodate
+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