X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c09ebb8c04b7fdd0726dc5cd3564aa58dafe4cba..043ef55b227146d2482859c66573b3229042ee75:/testsuite/hardlinks.test

diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index e44fd458..4ffad97b 100644
--- a/testsuite/hardlinks.test
+++ b/testsuite/hardlinks.test
@@ -12,8 +12,6 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 # Build some hardlinks
 
 fromdir="$scratchdir/from"
@@ -30,16 +28,34 @@ echo "This is the file" > "$name1"
 ln "$name1" "$name2" || fail "Can't create hardlink"
 ln "$name2" "$name3" || fail "Can't create hardlink"
 cp "$name2" "$name4" || fail "Can't copy file"
+cat $srcdir/*.c >"$fromdir/text"
 
 checkit "$RSYNC -aHivv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
-rm -rf "$todir"
+
+echo "extra extra" >>"$todir/name1"
+
+checkit "$RSYNC -aHivv --no-whole-file \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+
+# Add a new link in a new subdirectory to test that we don't try to link
+# the files before the directory gets created.
+mkdir "$fromdir/subdir"
+ln "$name1" "$fromdir/subdir/new-file"
+rm "$todir/text"
+
+checkit "$RSYNC -aHivv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+
+# Do some duplicate copies using --link-dest and --copy-dest to test that
+# we hard-link all locally-inherited items.
+checkit "$RSYNC -aHivv --link-dest=\"$todir\" \"$fromdir/\" \"$chkdir/\"" "$todir" "$chkdir"
+
+rm -rf "$chkdir"
+checkit "$RSYNC -aHivv --copy-dest=\"$todir\" \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir"
 
 # Make sure there's nothing wrong with sending a single file with -H
-# enabled (this has had a problem twice now, so we need this).
-mkdir "$chkdir"
-cp -p "$name1" "$chkdir"
-$RSYNC -avvi -f '-! */' "$fromdir/" "$chkdir/"
-checkit "$RSYNC -aHivv \"$name1\" \"$todir/\"" "$chkdir" "$todir"
+# enabled (this has broken twice so far, so we need this test).
+rm -rf "$todir"
+$RSYNC -aHivv "$name1" "$todir/"
+diff $diffopt "$name1" "$todir" || test_fail "solo copy of name1 failed"
 
 # The script would have aborted on error, so getting here means we've won.
 exit 0