X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/49374592254ece4c0e20128a55c3c43bd32438f6..05118158f4f59a5f512e5bab640f253332a6e181:/testsuite/duplicates.test

diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test
index 02f330fb..9b1a24ce 100644
--- a/testsuite/duplicates.test
+++ b/testsuite/duplicates.test
@@ -36,19 +36,18 @@ ln -s "$name1" "$name2" || fail "can't create symlink"
 
 outfile="$scratchdir/rsync.out"
 
-checkit "rsync -avv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \
+checkit "$RSYNC -avv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \
     | tee "$outfile"
 
 # Make sure each file was only copied once...
 if [ `grep -c '^name1$' "$outfile"` != 1 ]
 then
-    test_xfail "name1 was not copied exactly once"
+    test_fail "name1 was not copied exactly once"
 fi
-if [ `grep -c '^name2$' "$outfile"` != 1 ]
+if [ `grep -c '^name2 -> ' "$outfile"` != 1 ]
 then
-    test_xfail "name2 was not copied exactly once"
+    test_fail "name2 was not copied exactly once"
 fi
 
+# The script would have aborted on error, so getting here means we've won.
 exit 0
-# last [] may have failed but if we get here then we've won
-