summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2015-06-10 15:20:01 -0700
committerWayne Davison <wayned@samba.org>2015-06-10 15:20:01 -0700
commit6feb7d37df3e276ec09467747c09fa86df75846e (patch)
treecd2ef3c2fe77fba2a98c868238fa3d244b369d84 /testsuite
parent81ff413bb0d04bdccfdee82c32a76d26b5d08434 (diff)
downloadrsync-6feb7d37df3e276ec09467747c09fa86df75846e.tar.gz
Change "fail" to "test_fail".
Fixes bug 11322.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/chgrp.test4
-rw-r--r--testsuite/duplicates.test2
-rw-r--r--testsuite/hardlinks.test6
3 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/chgrp.test b/testsuite/chgrp.test
index 0c1f05c2..8cd6c107 100644
--- 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 3b4ebab0..e64b8083 100644
--- 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 c7c5314e..740d725f 100644
--- 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"