X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bc3b5b255819230bda8ca80961a7bbaa38a43099..79028af116752d192634f44e672f0b8b51ba7785:/testsuite/duplicates.test

diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test
index 54c3a06e..0459416f 100644
--- a/testsuite/duplicates.test
+++ b/testsuite/duplicates.test
@@ -2,7 +2,7 @@
 
 # Copyright (C) 2002 by Martin Pool <mbp@samba.org>
 
-# This program is distributable under the terms of the GNU GPL see
+# This program is distributable under the terms of the GNU GPL (see
 # COPYING).
 
 # Test rsync handling of duplicate filenames.  
@@ -19,15 +19,10 @@
 
 # This test is not great, because it is a timing-dependent bug.
 
-. $srcdir/testsuite/rsync.fns
-
-set -x
+. "$suitedir/rsync.fns"
 
 # Build some hardlinks
 
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
-
 mkdir "$fromdir"
 name1="$fromdir/name1"
 name2="$fromdir/name2"
@@ -42,13 +37,12 @@ checkit "$RSYNC -avv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$
 # 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 ]
 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
-