X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/79c9d8a1803d0b7437bd88bc9ee84b91886bcbe4..7ca9250db01827ed80eabee1103212e2718a624a:/testsuite/duplicates.test diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test index f391d1b9..a81fe687 100644 --- a/testsuite/duplicates.test +++ b/testsuite/duplicates.test @@ -21,8 +21,6 @@ . $srcdir/testsuite/rsync.fns -test_skipped "Known minor bug in this code" - set -x # Build some hardlinks @@ -38,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 exit 0 # last [] may have failed but if we get here then we've won -