Fixed the hard-link check again, adding a comment as to

[rsync/rsync.git] / testsuite / itemize.test

diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index c041fbb..0b7300c 100644 (file)
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -10,15 +10,6 @@
 
 . "$suitedir/rsync.fns"
 
-case "$RSYNC" in
-*protocol=29*)
-    sed_cmd='/_P30_/d; s/_P29_//'
-    ;;
-*)
-    sed_cmd='/_P29_/d; s/_P30_//'
-    ;;
-esac
-
 to2dir="$tmpdir/to2"
 
 chkfile="$scratchdir/rsync.chk"
@@ -35,7 +26,8 @@ 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
+# 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
@@ -44,15 +36,28 @@ else
 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"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 cd+++++++++ ./
 cd+++++++++ bar/
-cd+++++++++ foo/_P30_
 cd+++++++++ bar/baz/
 >f+++++++++ bar/baz/rsync
-cd+++++++++ foo/_P29_
+cd+++++++++ foo/
 >f+++++++++ foo/config1
 >f+++++++++ foo/config2
 >f+++++++++ foo/extra
@@ -67,7 +72,7 @@ cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
 chmod 601 "$fromdir/foo/config2"
 $RSYNC -iplrH "$fromdir/" "$todir/" \
     | tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 >f..T...... bar/baz/rsync
 >f..T...... foo/config1
 >f.sTp..... foo/config2
@@ -87,13 +92,12 @@ chmod 777 "$todir/bar/baz/rsync"
 
 $RSYNC -iplrtc "$fromdir/" "$todir/" \
     | tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-.d..t...... foo/_P30_
+cat <<EOT >"$chkfile"
 .f..tp..... bar/baz/rsync
-.d..t...... foo/_P29_
+.d..t...... foo/
 .f..t...... foo/config1
 >fcstp..... foo/config2
-cL..T...... foo/sym -> ../bar/baz/rsync
+cL.$T...... foo/sym -> ../bar/baz/rsync
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
 
@@ -103,7 +107,7 @@ chmod 600 "$fromdir/foo/config2"
 $RSYNC -vvplrH "$fromdir/" "$todir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 bar/baz/rsync is uptodate
 foo/config1 is uptodate
 foo/config2
@@ -117,7 +121,7 @@ $RSYNC -a -f '-! */' "$fromdir/" "$todir"
 $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 .d          ./
 .d          bar/
 .d          bar/baz/
@@ -135,7 +139,7 @@ touch "$todir/foo/config2"
 $RSYNC -vplrtH "$fromdir/" "$todir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 foo/config2
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed"
@@ -144,7 +148,7 @@ chmod 757 "$todir/foo/config1"
 touch "$todir/foo/config2"
 $RSYNC -iplrtH "$fromdir/" "$todir/" \
     | tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 .f...p..... foo/config1
 >f..t...... foo/config2
 EOT
@@ -153,7 +157,22 @@ diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
 $RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+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/
@@ -162,14 +181,14 @@ cd          foo/
 cf          foo/config1
 cf          foo/config2
 hf          foo/extra => foo/config1
-cL          foo/sym -> ../bar/baz/rsync
+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"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat - "$chkfile.extra" <<EOT >"$chkfile"
 hf          foo/extra => foo/config1
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
@@ -178,7 +197,7 @@ rm -rf "$to2dir"
 $RSYNC -vvplrtH --copy-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 ./ is uptodate
 bar/ is uptodate
 bar/baz/ is uptodate
@@ -187,7 +206,7 @@ foo/ is uptodate
 foo/config1 is uptodate
 foo/config2 is uptodate
 foo/extra => foo/config1
-foo/sym is uptodate
+foo/sym $is_uptodate
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 10 failed"
 
@@ -195,7 +214,7 @@ rm -rf "$to2dir"
 $RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 cd          ./
 cd          bar/
 cd          bar/baz/
@@ -204,21 +223,21 @@ cd          foo/
 hf          foo/config1
 hf          foo/config2
 hf          foo/extra => foo/config1
-$L          foo/sym -> ../bar/baz/rsync
+$L$sym_dots foo/sym -> ../bar/baz/rsync
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
 
 rm -rf "$to2dir"
 $RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+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"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat - "$chkfile.extra" <<EOT >"$chkfile"
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
 
@@ -226,7 +245,7 @@ rm -rf "$to2dir"
 $RSYNC -vvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 ./ is uptodate
 bar/ is uptodate
 bar/baz/ is uptodate
@@ -235,7 +254,7 @@ foo/ is uptodate
 foo/config1 is uptodate
 foo/config2 is uptodate
 foo/extra is uptodate
-foo/sym is uptodate
+foo/sym $is_uptodate
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
 
@@ -243,7 +262,7 @@ rm -rf "$to2dir"
 $RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 cd          ./
 cd          bar/
 cd          bar/baz/
@@ -252,14 +271,14 @@ cd          foo/
 .f          foo/config1
 .f          foo/config2
 .f          foo/extra
-.L          foo/sym -> ../bar/baz/rsync
+$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"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat - "$chkfile.extra" <<EOT >"$chkfile"
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
 
@@ -267,7 +286,7 @@ rm -rf "$to2dir"
 $RSYNC -vvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
-sed -e "$sed_cmd" <<EOT >"$chkfile"
+cat <<EOT >"$chkfile"
 ./ is uptodate
 bar/ is uptodate
 bar/baz/ is uptodate
@@ -276,7 +295,7 @@ foo/ is uptodate
 foo/config1 is uptodate
 foo/config2 is uptodate
 foo/extra is uptodate
-foo/sym is uptodate
+foo/sym $is_uptodate
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 17 failed"