From 554caaf6ffc721fe83debe0eb5e555136b01f0bb Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 4 Aug 2011 20:52:31 +0200
Subject: tests: complete the renaming framework_failure -> framework_failure_

These changes were mostly mechanical, made by running the
following command:

  git grep -lw framework_failure | grep -v ChangeLog \
    | xargs perl -pi -e 's/\b(framework_failure)\b/${1}_/'

and then editing init.cfg and `tests/cp/cp-a-selinux' by hand.

* tests/init.cfg (framework_failure): Remove, `framework_failure_'
from init.sh should be used instead in the tests.
Remove now-obsolete "FIXME" comment.
(is_local_dir_, require_strace_, require_membership_in_two_groups_,
require_sparse_support_, skip_if_mcstransd_is_running_,
mkfifo_or_skip_) Use `framework_failure_', not `framework_failure'.
* Many test scripts: Likewise.
---
 tests/cp/abuse               |  8 ++++----
 tests/cp/acl                 | 16 ++++++++--------
 tests/cp/backup-dir          |  2 +-
 tests/cp/backup-is-src       |  4 ++--
 tests/cp/capability          |  4 ++--
 tests/cp/cp-HL               |  8 ++++----
 tests/cp/cp-a-selinux        | 18 +++++++++---------
 tests/cp/cp-deref            |  6 +++---
 tests/cp/cp-i                |  6 +++---
 tests/cp/cp-mv-enotsup-xattr |  4 ++--
 tests/cp/cp-parents          |  8 ++++----
 tests/cp/deref-slink         |  4 ++--
 tests/cp/dir-rm-dest         |  2 +-
 tests/cp/dir-slash           |  4 ++--
 tests/cp/dir-vs-file         |  4 ++--
 tests/cp/fail-perm           | 10 +++++-----
 tests/cp/fiemap-empty        |  4 ++--
 tests/cp/into-self           |  2 +-
 tests/cp/link                |  6 +++---
 tests/cp/link-heap           |  8 ++++----
 tests/cp/link-no-deref       |  2 +-
 tests/cp/link-preserve       | 12 ++++++------
 tests/cp/link-symlink        |  2 +-
 tests/cp/parent-perm         |  8 ++++----
 tests/cp/parent-perm-race    |  2 +-
 tests/cp/preserve-2          |  2 +-
 tests/cp/preserve-slink-time |  8 ++++----
 tests/cp/proc-zero-len       |  2 +-
 tests/cp/r-vs-symlink        |  6 +++---
 tests/cp/reflink-auto        |  4 ++--
 tests/cp/reflink-perm        |  4 ++--
 tests/cp/slink-2-slink       | 10 +++++-----
 tests/cp/sparse              |  2 +-
 tests/cp/sparse-fiemap       |  4 ++--
 tests/cp/special-bits        | 12 ++++++------
 tests/cp/src-base-dot        |  2 +-
 tests/cp/symlink-slash       |  4 ++--
 tests/cp/thru-dangling       |  8 ++++----
 38 files changed, 111 insertions(+), 111 deletions(-)

(limited to 'tests/cp')

diff --git a/tests/cp/abuse b/tests/cp/abuse
index 7ed8a037b..43b7df0d9 100755
--- a/tests/cp/abuse
+++ b/tests/cp/abuse
@@ -19,12 +19,12 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir a b c || framework_failure
-ln -s ../t a/1 || framework_failure
-echo payload > b/1 || framework_failure
+mkdir a b c || framework_failure_
+ln -s ../t a/1 || framework_failure_
+echo payload > b/1 || framework_failure_
 
 echo "cp: will not copy \`b/1' through just-created symlink \`c/1'" \
-  > exp || framework_failure
+  > exp || framework_failure_
 
 # Check both cases: a dangling symlink, and one pointing to a writable file.
 
diff --git a/tests/cp/acl b/tests/cp/acl
index 8c132a940..261a1c954 100755
--- a/tests/cp/acl
+++ b/tests/cp/acl
@@ -26,8 +26,8 @@ require_acl_
 grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null ||
   skip_ "insufficient ACL support"
 
-mkdir -p a b || framework_failure
-touch a/file || framework_failure
+mkdir -p a b || framework_failure_
+touch a/file || framework_failure_
 
 # Ensure that setfacl and getfacl work on this file system.
 skip=no
@@ -38,23 +38,23 @@ test $skip = yes &&
 
 # copy a file without preserving permissions
 cp a/file b/ || fail=1
-acl2=`cd b && getfacl file` || framework_failure
+acl2=`cd b && getfacl file` || framework_failure_
 test "$acl1" = "$acl2" || fail=1
 
 # Update with acl set above
-acl1=`cd a && getfacl file` || framework_failure
+acl1=`cd a && getfacl file` || framework_failure_
 
 # copy a file, preserving permissions
 cp -p a/file b/ || fail=1
-acl2=`cd b && getfacl file` || framework_failure
+acl2=`cd b && getfacl file` || framework_failure_
 test "$acl1" = "$acl2" || fail=1
 
 # copy a file, preserving permissions, with --attributes-only
-echo > a/file || framework_failure # add some data
-test -s a/file || framework_failure
+echo > a/file || framework_failure_ # add some data
+test -s a/file || framework_failure_
 cp -p --attributes-only a/file b/ || fail=1
 test -s b/file && fail=1
-acl2=`cd b && getfacl file` || framework_failure
+acl2=`cd b && getfacl file` || framework_failure_
 test "$acl1" = "$acl2" || fail=1
 
 Exit $fail
diff --git a/tests/cp/backup-dir b/tests/cp/backup-dir
index c89aac5c2..708b9d7dd 100755
--- a/tests/cp/backup-dir
+++ b/tests/cp/backup-dir
@@ -19,7 +19,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir x y || framework_failure
+mkdir x y || framework_failure_
 
 
 cp -a x y || fail=1
diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src
index 8e683ed85..bb6478940 100755
--- a/tests/cp/backup-is-src
+++ b/tests/cp/backup-is-src
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-echo a > a || framework_failure
-echo a-tilde > a~ || framework_failure
+echo a > a || framework_failure_
+echo a-tilde > a~ || framework_failure_
 
 # This cp command should exit nonzero.
 cp --b=simple a~ a > out 2>&1 && fail=1
diff --git a/tests/cp/capability b/tests/cp/capability
index be5fb082a..a0fb60849 100755
--- a/tests/cp/capability
+++ b/tests/cp/capability
@@ -31,8 +31,8 @@ grep '^#define HAVE_CAP 1' $CONFIG_HEADER > /dev/null \
   || skip_ "getcap utility not found"
 
 
-touch file || framework_failure
-chown $NON_ROOT_USERNAME file || framework_failure
+touch file || framework_failure_
+chown $NON_ROOT_USERNAME file || framework_failure_
 
 setcap 'cap_net_bind_service=ep' file ||
   skip_ "setcap doesn't work"
diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL
index 49d1fa4d9..9a146240d 100755
--- a/tests/cp/cp-HL
+++ b/tests/cp/cp-HL
@@ -19,10 +19,10 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir src-dir dest-dir || framework_failure
-echo f > f || framework_failure
-ln -s f slink || framework_failure
-ln -s no-such-file src-dir/slink || framework_failure
+mkdir src-dir dest-dir || framework_failure_
+echo f > f || framework_failure_
+ln -s f slink || framework_failure_
+ln -s no-such-file src-dir/slink || framework_failure_
 
 
 cp -H -R slink src-dir dest-dir || fail=1
diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux
index 76684d6f4..8a8e37415 100755
--- a/tests/cp/cp-a-selinux
+++ b/tests/cp/cp-a-selinux
@@ -31,11 +31,11 @@ cleanup_() { cd /; umount "$cwd/mnt"; }
 ctx=root:object_r:tmp_t:s0
 
 # Check basic functionality - before check on fixed context mount
-touch c || framework_failure
-chcon $ctx c || framework_failure
-cp -a c d 2>err || framework_failure
-cp --preserve=context c e || framework_failure
-cp --preserve=all c f || framework_failure
+touch c || framework_failure_
+chcon $ctx c || framework_failure_
+cp -a c d 2>err || framework_failure_
+cp --preserve=context c e || framework_failure_
+cp --preserve=all c f || framework_failure_
 ls -Z d | grep $ctx || fail=1
 test -s err && fail=1   #there must be no stderr output for -a
 ls -Z e | grep $ctx || fail=1
@@ -52,11 +52,11 @@ mount -oloop,context=$ctx blob mnt           || skip=1
 test $skip = 1 \
   && skip_ "insufficient mount/ext2 support"
 
-cd mnt                                       || framework_failure
+cd mnt                                       || framework_failure_
 
-echo > f                                     || framework_failure
+echo > f                                     || framework_failure_
 
-echo > g                                     || framework_failure
+echo > g                                     || framework_failure_
 # /bin/cp from coreutils-6.7-3.fc7 would fail this test by letting cp
 # succeed (giving no diagnostics), yet leaving the destination file empty.
 cp -a f g 2>err || fail=1
@@ -85,7 +85,7 @@ grep "Operation not supported" err && fail=1
 # NFS mounted directory.  When doing that, I get this diagnostic:
 # cp: failed to set the security context of `g' to `system_u:object_r:nfs_t': \
 #   Operation not supported
-cat <<\EOF > exp || framework_failure=1
+cat <<\EOF > exp || framework_failure_
 cp: failed to set the security context of
 EOF
 
diff --git a/tests/cp/cp-deref b/tests/cp/cp-deref
index 89900f6f2..1230ae0cb 100755
--- a/tests/cp/cp-deref
+++ b/tests/cp/cp-deref
@@ -20,9 +20,9 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir a b c d || framework_failure
-ln -s ../c a || framework_failure
-ln -s ../c b || framework_failure
+mkdir a b c d || framework_failure_
+ln -s ../c a || framework_failure_
+ln -s ../c b || framework_failure_
 
 
 # Before coreutils-5.94, the following would fail with this message:
diff --git a/tests/cp/cp-i b/tests/cp/cp-i
index 1bd51fa66..8e9d940e4 100755
--- a/tests/cp/cp-i
+++ b/tests/cp/cp-i
@@ -19,15 +19,15 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir -p a b/a/c || framework_failure
-touch a/c || framework_failure
+mkdir -p a b/a/c || framework_failure_
+touch a/c || framework_failure_
 
 
 # coreutils 6.2 cp would neglect to prompt in this case.
 echo n | cp -iR a b 2>/dev/null || fail=1
 
 # test miscellaneous combinations of -f -i -n parameters
-touch c d || framework_failure
+touch c d || framework_failure_
 echo "\`c' -> \`d'" > out_copy
 > out_empty
 
diff --git a/tests/cp/cp-mv-enotsup-xattr b/tests/cp/cp-mv-enotsup-xattr
index 2f26dbd82..9857fec41 100755
--- a/tests/cp/cp-mv-enotsup-xattr
+++ b/tests/cp/cp-mv-enotsup-xattr
@@ -56,9 +56,9 @@ xattr_name="user.foo"
 xattr_value="bar"
 xattr_pair="$xattr_name=\"$xattr_value\""
 
-echo test > xattr/a || framework_failure
+echo test > xattr/a || framework_failure_
 getfattr -d xattr/a >out_a || skip_ "failed to get xattr of file"
-grep -F "$xattr_pair" out_a >/dev/null && framework_failure
+grep -F "$xattr_pair" out_a >/dev/null && framework_failure_
 setfattr -n "$xattr_name" -v "$xattr_value" xattr/a >out_a \
   || skip_ "failed to set xattr of file"
 getfattr -d xattr/a >out_a || skip_ "failed to get xattr of file"
diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents
index 2f19af227..fcb5c447a 100755
--- a/tests/cp/cp-parents
+++ b/tests/cp/cp-parents
@@ -25,10 +25,10 @@ working_umask_or_skip_
 # Run the setgid check from the just-created directory.
 skip_if_setgid_
 
-mkdir foo bar || framework_failure
-mkdir -p a/b/c d e g || framework_failure
-ln -s d/a sym || framework_failure
-touch f || framework_failure
+mkdir foo bar || framework_failure_
+mkdir -p a/b/c d e g || framework_failure_
+ln -s d/a sym || framework_failure_
+touch f || framework_failure_
 
 
 # With 4.0.37 and earlier (back to when?), this would fail
diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink
index 9cc4962ac..e34b29b6f 100755
--- a/tests/cp/deref-slink
+++ b/tests/cp/deref-slink
@@ -20,8 +20,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-touch f slink-target || framework_failure
-ln -s slink-target slink || framework_failure
+touch f slink-target || framework_failure_
+ln -s slink-target slink || framework_failure_
 
 cp -d f slink || fail=1
 
diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest
index 23979a95d..c6712e2ed 100755
--- a/tests/cp/dir-rm-dest
+++ b/tests/cp/dir-rm-dest
@@ -19,7 +19,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir d e || framework_failure
+mkdir d e || framework_failure_
 
 # Do it once with no destination...
 cp -R --remove-destination d e || fail=1
diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash
index 57184ab13..e206bd007 100755
--- a/tests/cp/dir-slash
+++ b/tests/cp/dir-slash
@@ -20,8 +20,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir dir1 dir2 || framework_failure
-touch dir1/file || framework_failure
+mkdir dir1 dir2 || framework_failure_
+touch dir1/file || framework_failure_
 
 cp -R dir1/ dir2 || fail=1
 
diff --git a/tests/cp/dir-vs-file b/tests/cp/dir-vs-file
index 5a4451600..5beaf306b 100755
--- a/tests/cp/dir-vs-file
+++ b/tests/cp/dir-vs-file
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir dir || framework_failure
-touch file || framework_failure
+mkdir dir || framework_failure_
+touch file || framework_failure_
 
 
 # In 4.0.35, this cp invocation silently succeeded.
diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm
index 83d4711c3..404c83e39 100755
--- a/tests/cp/fail-perm
+++ b/tests/cp/fail-perm
@@ -19,11 +19,11 @@
 print_ver_ cp
 skip_if_root_
 
-chmod g-s . || framework_failure
-mkdir D D/D || framework_failure
-touch D/a || framework_failure
-chmod 0 D/a || framework_failure
-chmod u=rx,go=,-st D || framework_failure
+chmod g-s . || framework_failure_
+mkdir D D/D || framework_failure_
+touch D/a || framework_failure_
+chmod 0 D/a || framework_failure_
+chmod u=rx,go=,-st D || framework_failure_
 
 
 # This is expected to exit non-zero, because it can't read D/a.
diff --git a/tests/cp/fiemap-empty b/tests/cp/fiemap-empty
index 095d1b7c3..6ce595767 100755
--- a/tests/cp/fiemap-empty
+++ b/tests/cp/fiemap-empty
@@ -55,7 +55,7 @@ filefrag -v space.test | grep -F 'unwritten' > /dev/null ||
 rm space.test
 
 # Ensure we read a large empty file quickly
-fallocate -l 300MiB empty.big || framework_failure
+fallocate -l 300MiB empty.big || framework_failure_
 timeout 3 cp --sparse=always empty.big cp.test || fail=1
 test $(stat -c %s empty.big) = $(stat -c %s cp.test) || fail=1
 rm empty.big cp.test
@@ -63,7 +63,7 @@ rm empty.big cp.test
 # Ensure we handle extents beyond file size correctly.
 # Note until we support fallocate, we will not maintain
 # the file allocation.  FIXME: amend this test when fallocate is supported.
-fallocate -l 10MiB -n unwritten.withdata || framework_failure
+fallocate -l 10MiB -n unwritten.withdata || framework_failure_
 dd count=10 if=/dev/urandom conv=notrunc iflag=fullblock of=unwritten.withdata
 cp unwritten.withdata cp.test || fail=1
 test $(stat -c %s unwritten.withdata) = $(stat -c %s cp.test) || fail=1
diff --git a/tests/cp/into-self b/tests/cp/into-self
index ed10f2bc2..deb5a5325 100755
--- a/tests/cp/into-self
+++ b/tests/cp/into-self
@@ -24,7 +24,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir a dir || framework_failure
+mkdir a dir || framework_failure_
 
 
 # This command should exit nonzero.
diff --git a/tests/cp/link b/tests/cp/link
index 22c6ed257..73c8bb318 100755
--- a/tests/cp/link
+++ b/tests/cp/link
@@ -20,9 +20,9 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-touch src || framework_failure
-touch dest || framework_failure
-touch dest2 || framework_failure
+touch src || framework_failure_
+touch dest || framework_failure_
+touch dest2 || framework_failure_
 
 
 cp -f --link src dest || fail=1
diff --git a/tests/cp/link-heap b/tests/cp/link-heap
index 1b80021e0..d622bc4e7 100755
--- a/tests/cp/link-heap
+++ b/tests/cp/link-heap
@@ -26,10 +26,10 @@ b=$(printf %031d 1)
 (mkdir $a \
    && cd $a \
    && seq --format=%031g 10000 |xargs touch \
-   && seq --format=d%030g 10000 |xargs mkdir ) || framework_failure
-cp -al $a $b || framework_failure
-mkdir e || framework_failure
-mv $a $b e || framework_failure
+   && seq --format=d%030g 10000 |xargs mkdir ) || framework_failure_
+cp -al $a $b || framework_failure_
+mkdir e || framework_failure_
+mv $a $b e || framework_failure_
 
 (ulimit -v 20000; cp -al e f) || fail=1
 
diff --git a/tests/cp/link-no-deref b/tests/cp/link-no-deref
index 12007e2a6..ca0e5478c 100755
--- a/tests/cp/link-no-deref
+++ b/tests/cp/link-no-deref
@@ -19,7 +19,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-ln -s no-such-file dangling-slink || framework_failure
+ln -s no-such-file dangling-slink || framework_failure_
 
 
 # Prior to coreutils-6.0, this would fail on non-Linux kernels,
diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve
index 1e42b898a..d1212e518 100755
--- a/tests/cp/link-preserve
+++ b/tests/cp/link-preserve
@@ -20,12 +20,12 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-touch a || framework_failure
-ln a b || framework_failure
-mkdir c || framework_failure
-cp -d a b c || framework_failure
-test -f c/a || framework_failure
-test -f c/b || framework_failure
+touch a || framework_failure_
+ln a b || framework_failure_
+mkdir c || framework_failure_
+cp -d a b c || framework_failure_
+test -f c/a || framework_failure_
+test -f c/b || framework_failure_
 
 
 a_inode=`ls -i c/a|sed 's,c/.*,,'`
diff --git a/tests/cp/link-symlink b/tests/cp/link-symlink
index 0d09f5d83..fff1c5cb1 100755
--- a/tests/cp/link-symlink
+++ b/tests/cp/link-symlink
@@ -22,7 +22,7 @@ print_ver_ cp
 # Check that the timestamps of the symlink are copied
 # if we're using hardlink to symlink emulation.
 touch file
-ln -s file link || framework_failure
+ln -s file link || framework_failure_
 touch -m -h -d 2011-01-01 link ||
   skip_ "Your system doesn't support updating symlink timestamps"
 case `stat --format=%y link` in
diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm
index 896145faa..6c8218148 100755
--- a/tests/cp/parent-perm
+++ b/tests/cp/parent-perm
@@ -23,14 +23,14 @@ working_umask_or_skip_
 # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least
 require_local_dir_
 
-mkdir -p a/b/c a/b/d e || framework_failure
-touch a/b/c/foo a/b/d/foo || framework_failure
-cp -p --parent a/b/c/foo e || framework_failure
+mkdir -p a/b/c a/b/d e || framework_failure_
+touch a/b/c/foo a/b/d/foo || framework_failure_
+cp -p --parent a/b/c/foo e || framework_failure_
 
 # Make permissions of e/a different, so that we exercise the
 # code in cp -p --parents that propagates permissions even
 # to a destination directory that it doesn't create.
-chmod g-rx e/a e/a/b || framework_failure
+chmod g-rx e/a e/a/b || framework_failure_
 
 cp -p --parent a/b/d/foo e || fail=1
 
diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race
index 366efbaa7..0f5200250 100755
--- a/tests/cp/parent-perm-race
+++ b/tests/cp/parent-perm-race
@@ -23,7 +23,7 @@ print_ver_ cp
 require_local_dir_
 
 umask 002
-mkdir mode ownership d || framework_failure
+mkdir mode ownership d || framework_failure_
 chmod g+s d 2>/dev/null # The cp test is valid either way.
 
 
diff --git a/tests/cp/preserve-2 b/tests/cp/preserve-2
index 023a2909e..03c6a7134 100755
--- a/tests/cp/preserve-2
+++ b/tests/cp/preserve-2
@@ -22,7 +22,7 @@ print_ver_ cp
 # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least
 require_local_dir_
 
-touch f || framework_failure
+touch f || framework_failure_
 
 cp --preserve=mode,links f g || fail=1
 
diff --git a/tests/cp/preserve-slink-time b/tests/cp/preserve-slink-time
index 0f9bfe53d..f9c60198a 100755
--- a/tests/cp/preserve-slink-time
+++ b/tests/cp/preserve-slink-time
@@ -23,7 +23,7 @@ grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null ||
 grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null ||
   skip_ 'this system lacks the utimensat function'
 
-ln -s no-such dangle || framework_failure
+ln -s no-such dangle || framework_failure_
 
 # If the current file system lacks sub-second resolution, sleep for 2s to
 # ensure that the times on the copy are different from those of the original.
@@ -32,9 +32,9 @@ case $(stat --format=%y dangle) in
 esac
 
 # Can't use --format=%x, as lstat() modifies atime on some platforms.
-cp -Pp dangle d2 || framework_failure
-stat --format=%y dangle > t1 || framework_failure
-stat --format=%y d2 > t2 || framework_failure
+cp -Pp dangle d2 || framework_failure_
+stat --format=%y dangle > t1 || framework_failure_
+stat --format=%y d2 > t2 || framework_failure_
 
 compare t1 t2 || fail=1
 
diff --git a/tests/cp/proc-zero-len b/tests/cp/proc-zero-len
index 77c764b2e..53abc43f9 100755
--- a/tests/cp/proc-zero-len
+++ b/tests/cp/proc-zero-len
@@ -19,7 +19,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-touch empty || framework_failure
+touch empty || framework_failure_
 
 f=/proc/cpuinfo
 test -r $f || f=empty
diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink
index feca7d631..0ca358cf4 100755
--- a/tests/cp/r-vs-symlink
+++ b/tests/cp/r-vs-symlink
@@ -23,9 +23,9 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-echo abc > foo || framework_failure
-ln -s foo slink || framework_failure
-ln -s no-such-file no-file || framework_failure
+echo abc > foo || framework_failure_
+ln -s foo slink || framework_failure_
+ln -s no-such-file no-file || framework_failure_
 
 
 # This would fail in 4.1.5, not in 4.1.6.
diff --git a/tests/cp/reflink-auto b/tests/cp/reflink-auto
index 1639bb4d4..90251e0d4 100755
--- a/tests/cp/reflink-auto
+++ b/tests/cp/reflink-auto
@@ -22,9 +22,9 @@ print_ver_ cp
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
 . "$abs_srcdir/other-fs-tmpdir"
 a_other="$other_partition_tmpdir/a"
-rm -f "$a_other" || framework_failure
+rm -f "$a_other" || framework_failure_
 
-echo non_zero_size > "$a_other" || framework_failure
+echo non_zero_size > "$a_other" || framework_failure_
 
 # we shouldn't be able to reflink() files on separate partitions
 cp --reflink      "$a_other" b && fail=1
diff --git a/tests/cp/reflink-perm b/tests/cp/reflink-perm
index 367704d72..a712d740a 100755
--- a/tests/cp/reflink-perm
+++ b/tests/cp/reflink-perm
@@ -23,10 +23,10 @@ print_ver_ cp
 : > time_check
 : > file
 ts='2009-08-28 19:00'
-touch -d "$ts" file || framework_failure
+touch -d "$ts" file || framework_failure_
 test time_check -nt file || skip_ "The system clock is wrong"
 
-chmod a=rwx file || framework_failure
+chmod a=rwx file || framework_failure_
 umask 077
 cp --reflink=auto --preserve file copy || fail=1
 
diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink
index 82a1d7b36..fb148e08e 100755
--- a/tests/cp/slink-2-slink
+++ b/tests/cp/slink-2-slink
@@ -20,11 +20,11 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-touch file || framework_failure
-ln -s file a || framework_failure
-ln -s file b || framework_failure
-ln -s no-such-file c || framework_failure
-ln -s no-such-file d || framework_failure
+touch file || framework_failure_
+ln -s file a || framework_failure_
+ln -s file b || framework_failure_
+ln -s no-such-file c || framework_failure_
+ln -s no-such-file d || framework_failure_
 
 cp --update --no-dereference a b || fail=1
 cp --update --no-dereference c d || fail=1
diff --git a/tests/cp/sparse b/tests/cp/sparse
index 294b90482..4d78640ee 100755
--- a/tests/cp/sparse
+++ b/tests/cp/sparse
@@ -25,7 +25,7 @@ require_sparse_support_
 # Make its size one larger than 128K, in order to tickle the
 # bug in coreutils-6.0.
 size=`expr 128 \* 1024 + 1`
-dd bs=1 seek=$size of=sparse < /dev/null 2> /dev/null || framework_failure
+dd bs=1 seek=$size of=sparse < /dev/null 2> /dev/null || framework_failure_
 
 
 cp --sparse=always sparse copy || fail=1
diff --git a/tests/cp/sparse-fiemap b/tests/cp/sparse-fiemap
index 37d8ea7a4..5eedb4fa7 100755
--- a/tests/cp/sparse-fiemap
+++ b/tests/cp/sparse-fiemap
@@ -100,8 +100,8 @@ for i in $(seq 1 2 21); do
       #   j: 6 extents found
 
       # exclude the physical block numbers; they always differ
-      filefrag -v j1 > ff1 || framework_failure
-      filefrag -vs j2 > ff2 || framework_failure
+      filefrag -v j1 > ff1 || framework_failure_
+      filefrag -vs j2 > ff2 || framework_failure_
       { f ff1; f ff2; } | $PERL $abs_top_srcdir/tests/filefrag-extent-compare \
         || {
              warn_ ignoring filefrag-reported extent map differences
diff --git a/tests/cp/special-bits b/tests/cp/special-bits
index 9168f143e..e3e555937 100755
--- a/tests/cp/special-bits
+++ b/tests/cp/special-bits
@@ -24,12 +24,12 @@
 print_ver_ cp
 require_root_
 
-touch a b c || framework_failure
-chmod u+sx,go= a || framework_failure
-chmod u=rwx,g=sx,o= b || framework_failure
-chmod a=r,ug+sx c || framework_failure
-chown $NON_ROOT_USERNAME . || framework_failure
-chmod u=rwx,g=rx,o=rx . || framework_failure
+touch a b c || framework_failure_
+chmod u+sx,go= a || framework_failure_
+chmod u=rwx,g=sx,o= b || framework_failure_
+chmod a=r,ug+sx c || framework_failure_
+chown $NON_ROOT_USERNAME . || framework_failure_
+chmod u=rwx,g=rx,o=rx . || framework_failure_
 
 
 cp -p a a2 || fail=1
diff --git a/tests/cp/src-base-dot b/tests/cp/src-base-dot
index e9bef6596..069c1935c 100755
--- a/tests/cp/src-base-dot
+++ b/tests/cp/src-base-dot
@@ -19,7 +19,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir x y || framework_failure
+mkdir x y || framework_failure_
 
 
 cd y
diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash
index 70a843534..45c306936 100755
--- a/tests/cp/symlink-slash
+++ b/tests/cp/symlink-slash
@@ -20,8 +20,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkdir dir || framework_failure
-ln -s dir symlink || framework_failure
+mkdir dir || framework_failure_
+ln -s dir symlink || framework_failure_
 
 cp -dR symlink/ s || fail=1
 set `ls -l s`
diff --git a/tests/cp/thru-dangling b/tests/cp/thru-dangling
index 9e061220b..62f111587 100755
--- a/tests/cp/thru-dangling
+++ b/tests/cp/thru-dangling
@@ -19,11 +19,11 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-ln -s no-such dangle || framework_failure
-echo hi > f || framework_failure
-echo hi > exp || framework_failure
+ln -s no-such dangle || framework_failure_
+echo hi > f || framework_failure_
+echo hi > exp || framework_failure_
 echo "cp: not writing through dangling symlink \`dangle'" \
-    > exp-err || framework_failure
+    > exp-err || framework_failure_
 
 
 # Starting with 6.9.90, this usage fails, by default:
-- 
cgit v1.2.3-54-g00ecf