Change "fail" to "test_fail".

Fixes bug 11322.

diff --git a/testsuite/chgrp.test b/testsuite/chgrp.test
index 0c1f05c2d74e837bbf1db9f7cf717d0eebdcf211..8cd6c107067b278ee9bdba62bd9193ce9e48f39c 100644 (file)
--- a/testsuite/chgrp.test
+++ b/testsuite/chgrp.test
@@ -13,14 +13,14 @@
 
 # Build some hardlinks
 
-mygrps="`rsync_getgroups`" || fail "Can't get groups"
+mygrps="`rsync_getgroups`" || test_fail "Can't get groups"
 mkdir "$fromdir"
 
 for g in $mygrps
 do
     name="$fromdir/foo-$g"
     date > "$name"
-    chgrp "$g" "$name" || fail "Can't chgrp"
+    chgrp "$g" "$name" || test_fail "Can't chgrp"
 done
 sleep 2
 

diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test
index 3b4ebab0aea7a424d00e5beff9372bfd3d27a9ab..e64b808393f4b65eb172ef215470192f5c45ed45 100644 (file)
--- a/testsuite/duplicates.test
+++ b/testsuite/duplicates.test
@@ -27,7 +27,7 @@ mkdir "$fromdir"
 name1="$fromdir/name1"
 name2="$fromdir/name2"
 echo "This is the file" > "$name1"
-ln -s "$name1" "$name2" || fail "can't create symlink"
+ln -s "$name1" "$name2" || test_fail "can't create symlink"
 
 outfile="$scratchdir/rsync.out"
 

diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index c7c5314e163c4b75352a2af334051920fabb93c7..740d725f1f72994999bf9a59d984420e8a5fed3b 100644 (file)
--- a/testsuite/hardlinks.test
+++ b/testsuite/hardlinks.test
@@ -29,8 +29,8 @@ name3="$fromdir/name3"
 name4="$fromdir/name4"
 echo "This is the file" > "$name1"
 ln "$name1" "$name2" || test_skipped "Can't create hardlink"
-ln "$name2" "$name3" || fail "Can't create hardlink"
-cp "$name2" "$name4" || fail "Can't copy file"
+ln "$name2" "$name3" || test_fail "Can't create hardlink"
+cp "$name2" "$name4" || test_fail "Can't copy file"
 cat $srcdir/*.c >"$fromdir/text"
 
 checkit "$RSYNC -aHivv --debug=HLINK5 '$fromdir/' '$todir/'" "$fromdir" "$todir"
@@ -67,7 +67,7 @@ checkit "$RSYNC -aHivv --debug=HLINK5 --copy-dest='$todir' '$fromdir/' '$chkdir/
 
 # Create a hard link that has only one part in the hierarchy.
 echo "This is another file" >"$fromdir/solo"
-ln "$fromdir/solo" "$chkdir/solo" || fail "Can't create hardlink"
+ln "$fromdir/solo" "$chkdir/solo" || test_fail "Can't create hardlink"
 
 # Make sure that the checksum data doesn't slide due to an HLINK_BUMP() change.
 $RSYNC -aHivc --debug=HLINK5 "$fromdir/" "$chkdir/" | tee "$outfile"