A slightly better fix than the last one (though it won't make any

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

diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index e44fd45..2f5399e 100644 (file)
--- a/testsuite/hardlinks.test
+++ b/testsuite/hardlinks.test
@@ -30,16 +30,25 @@ 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"
+
+echo "extra extra" >>"$todir/name1"
+
+checkit "$RSYNC -aHivv --no-whole-file \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+
+mkdir "$fromdir/subdir"
+ln "$name1" "$fromdir/subdir/new-file"
+rm "$todir/text"
 
 checkit "$RSYNC -aHivv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
-rm -rf "$todir"
 
 # 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