X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3b8ed84245622d9dc04f4d09d8fa7619bd5829b3..5a3e9ff6081cb83873881df9a7bcfc19f9af5e58:/testsuite/itemize.test

diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 06b73fa8..5085f973 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -10,7 +10,7 @@
 
 . "$suitedir/rsync.fns"
 
-lddir="$tmpdir/ld"
+to2dir="$tmpdir/to2"
 
 chkfile="$scratchdir/rsync.chk"
 outfile="$scratchdir/rsync.out"
@@ -27,8 +27,13 @@ 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"
+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"
@@ -91,7 +96,7 @@ 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"
@@ -134,8 +139,7 @@ cat <<EOT >"$chkfile"
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
 
-mv "$todir" "$lddir"
-$RSYNC -ivvplrtH --copy-dest=../ld "$fromdir/" "$todir/" \
+$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
 cat <<EOT >"$chkfile"
@@ -151,16 +155,16 @@ cL        foo/sym -> ../bar/baz/rsync
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
 
-rm -rf "$todir"
-$RSYNC -iplrtH --copy-dest=../ld "$fromdir/" "$todir/" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 cat <<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"
@@ -171,14 +175,13 @@ 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/" \
+rm -rf "$to2dir"
+$RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
 cat <<EOT >"$chkfile"
@@ -194,22 +197,22 @@ $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/" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 cat <<EOT >"$chkfile"
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
 
-rm -rf "$todir"
-$RSYNC -iplrtH --link-dest=../ld "$fromdir/" "$todir/" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --link-dest=../to "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 cat <<EOT >"$chkfile"
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
 
-rm -rf "$todir"
-$RSYNC -vvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+rm -rf "$to2dir"
+$RSYNC -vvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
     | tee "$outfile"
 filter_outfile
 cat <<EOT >"$chkfile"
@@ -220,17 +223,15 @@ bar/baz/rsync is uptodate
 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 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"
 cd        ./
 cd        bar/
@@ -239,19 +240,20 @@ cd        bar/baz/
 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 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"
 EOT
 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"
@@ -262,7 +264,7 @@ bar/baz/rsync is uptodate
 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 17 failed"