Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure the new link_dest_used value gets zeroed on init.
[rsync/rsync.git]
/
testsuite
/
duplicates.test
diff --git
a/testsuite/duplicates.test
b/testsuite/duplicates.test
index
9e47c70
..
0459416
100644
(file)
--- a/
testsuite/duplicates.test
+++ b/
testsuite/duplicates.test
@@
-2,7
+2,7
@@
# Copyright (C) 2002 by Martin Pool <mbp@samba.org>
# 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.
# COPYING).
# Test rsync handling of duplicate filenames.
@@
-19,17
+19,10
@@
# This test is not great, because it is a timing-dependent bug.
# This test is not great, because it is a timing-dependent bug.
-. $srcdir/testsuite/rsync.fns
-
-test_skipped "Known minor bug in this code"
-
-set -x
+. "$suitedir/rsync.fns"
# Build some hardlinks
# Build some hardlinks
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
-
mkdir "$fromdir"
name1="$fromdir/name1"
name2="$fromdir/name2"
mkdir "$fromdir"
name1="$fromdir/name1"
name2="$fromdir/name2"
@@
-44,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
# Make sure each file was only copied once...
if [ `grep -c '^name1$' "$outfile"` != 1 ]
then
- test_
x
fail "name1 was not copied exactly once"
+ test_fail "name1 was not copied exactly once"
fi
fi
-if [ `grep -c '^name2
$
' "$outfile"` != 1 ]
+if [ `grep -c '^name2
->
' "$outfile"` != 1 ]
then
then
- test_
x
fail "name2 was not copied exactly once"
+ test_fail "name2 was not copied exactly once"
fi
fi
+# The script would have aborted on error, so getting here means we've won.
exit 0
exit 0
-# last [] may have failed but if we get here then we've won
-