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.

36 files changed, 115 insertions, 115 deletions

diff --git a/tests/mv/acl b/tests/mv/acl
index 669868d34..75ae27e0f 100755
--- a/tests/mv/acl
+++ b/tests/mv/acl
@@ -29,9 +29,9 @@ grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null ||
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
 . "$abs_srcdir/other-fs-tmpdir"
 
-touch file || framework_failure
+touch file || framework_failure_
 t1=$other_partition_tmpdir/t1
-touch $t1 || framework_failure
+touch $t1 || framework_failure_
 
 skip_partition=none
 # Ensure that setfacl and getfacl work on this file system.
@@ -45,23 +45,23 @@ test $skip_partition != none &&
 
 # move the access acl of a file
 mv file "$other_partition_tmpdir" || fail=1
-acl2=`cd "$other_partition_tmpdir" && getfacl file` || framework_failure
+acl2=`cd "$other_partition_tmpdir" && getfacl file` || framework_failure_
 test "$acl1" = "$acl2" || fail=1
 
 # move the access acl of a directory
-mkdir dir || framework_failure
-setfacl -m user:bin:rw dir || framework_failure
-acl1=`getfacl dir` || framework_failure
+mkdir dir || framework_failure_
+setfacl -m user:bin:rw dir || framework_failure_
+acl1=`getfacl dir` || framework_failure_
 mv dir "$other_partition_tmpdir" || fail=1
-acl2=`cd "$other_partition_tmpdir" && getfacl dir` || framework_failure
+acl2=`cd "$other_partition_tmpdir" && getfacl dir` || framework_failure_
 test "$acl1" = "$acl2" || fail=1
 
 # move the default acl of a directory
-mkdir dir2 || framework_failure
-setfacl -d -m user:bin:rw dir2 || framework_failure
-acl1=`getfacl dir2` || framework_failure
+mkdir dir2 || framework_failure_
+setfacl -d -m user:bin:rw dir2 || framework_failure_
+acl1=`getfacl dir2` || framework_failure_
 mv dir2 "$other_partition_tmpdir" || fail=1
-acl2=`cd "$other_partition_tmpdir" && getfacl dir2` || framework_failure
+acl2=`cd "$other_partition_tmpdir" && getfacl dir2` || framework_failure_
 test "$acl1" = "$acl2" || fail=1
 
 Exit $fail
diff --git a/tests/mv/atomic b/tests/mv/atomic
index dfc2cbf67..2a3ca966b 100755
--- a/tests/mv/atomic
+++ b/tests/mv/atomic
@@ -30,8 +30,8 @@ require_strace_ unlink
 #   $ strace -qe unlink ./mv -T s1 s2
 #   $
 
-ln -s t1 s1 || framework_failure
-ln -s t2 s2 || framework_failure
+ln -s t1 s1 || framework_failure_
+ln -s t2 s2 || framework_failure_
 
 
 strace -qe unlink mv -T s1 s2 > out 2>&1 || fail=1
diff --git a/tests/mv/atomic2 b/tests/mv/atomic2
index e69d166fc..0bb229f0b 100755
--- a/tests/mv/atomic2
+++ b/tests/mv/atomic2
@@ -28,8 +28,8 @@ require_strace_ unlink
 #   $ rm -f a b b2; touch a b; ln b b2; strace -e unlink ./mv a b
 #   $
 
-touch a b || framework_failure
-ln b b2 || framework_failure
+touch a b || framework_failure_
+ln b b2 || framework_failure_
 
 
 strace -qe unlink mv a b > out 2>&1 || fail=1
diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir
index c5725d65c..3026365dd 100755
--- a/tests/mv/backup-dir
+++ b/tests/mv/backup-dir
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-mkdir A B || framework_failure
-touch X Y || framework_failure
+mkdir A B || framework_failure_
+touch X Y || framework_failure_
 
 
 # Before coreutils-6.2, the " (backup: `B.~1~')" suffix was not printed.
diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src
index 489798157..ba05870ab 100755
--- a/tests/mv/backup-is-src
+++ b/tests/mv/backup-is-src
@@ -24,9 +24,9 @@ cleanup_() { rm -rf "$other_partition_tmpdir"; }
 a="$other_partition_tmpdir/a"
 a2="$other_partition_tmpdir/a~"
 
-rm -f "$a" "$a2" || framework_failure
-echo a > "$a" || framework_failure
-echo a2 > "$a2" || framework_failure
+rm -f "$a" "$a2" || framework_failure_
+echo a > "$a" || framework_failure_
+echo a2 > "$a2" || framework_failure_
 
 # This mv command should exit nonzero.
 mv --b=simple "$a2" "$a" > out 2>&1 && fail=1
diff --git a/tests/mv/childproof b/tests/mv/childproof
index 40a923e4f..8c49de15d 100755
--- a/tests/mv/childproof
+++ b/tests/mv/childproof
@@ -23,9 +23,9 @@ print_ver_ cp mv ln
 
 skip_if_root_
 
-mkdir a b c || framework_failure
-echo a > a/f || framework_failure
-echo b > b/f || framework_failure
+mkdir a b c || framework_failure_
+echo a > a/f || framework_failure_
+echo b > b/f || framework_failure_
 
 
 cp a/f b/f c 2> /dev/null && fail=1
diff --git a/tests/mv/diag b/tests/mv/diag
index ccf034e49..2007ee063 100755
--- a/tests/mv/diag
+++ b/tests/mv/diag
@@ -19,9 +19,9 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-touch f1 || framework_failure
-touch f2 || framework_failure
-touch d || framework_failure
+touch f1 || framework_failure_
+touch f2 || framework_failure_
+touch d || framework_failure_
 
 # These mv commands should all exit nonzero.
 
diff --git a/tests/mv/dir-file b/tests/mv/dir-file
index 885f512bf..8c6925564 100755
--- a/tests/mv/dir-file
+++ b/tests/mv/dir-file
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-mkdir -p dir/file || framework_failure
-> file || framework_failure
+mkdir -p dir/file || framework_failure_
+> file || framework_failure_
 
 
 # These should both fail, but until fileutils-4.0q only the second one did.
diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir
index 4d6955e3f..452bb7de9 100755
--- a/tests/mv/dir2dir
+++ b/tests/mv/dir2dir
@@ -20,8 +20,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-mkdir -p a/t b/t || framework_failure
-touch a/t/f || framework_failure
+mkdir -p a/t b/t || framework_failure_
+touch a/t/f || framework_failure_
 
 
 # Expect this to fail with the expected diagnostic.
diff --git a/tests/mv/force b/tests/mv/force
index 984b46d32..4aa754003 100755
--- a/tests/mv/force
+++ b/tests/mv/force
@@ -22,8 +22,8 @@ print_ver_ mv
 ff=mvforce
 ff2=mvforce2
 
-echo force-contents > $ff || framework_failure
-ln $ff $ff2 || framework_failure
+echo force-contents > $ff || framework_failure_
+ln $ff $ff2 || framework_failure_
 
 # This mv command should exit nonzero.
 mv $ff $ff > out 2>&1 && fail=1
diff --git a/tests/mv/hard-2 b/tests/mv/hard-2
index 27ff87086..dbc412b61 100755
--- a/tests/mv/hard-2
+++ b/tests/mv/hard-2
@@ -22,11 +22,11 @@ print_ver_ cp mv
 
 skip_if_root_
 
-mkdir dst || framework_failure
-(cd dst && touch a b c) || framework_failure
-touch a || framework_failure
-ln a b || framework_failure
-ln a c || framework_failure
+mkdir dst || framework_failure_
+(cd dst && touch a b c) || framework_failure_
+touch a || framework_failure_
+ln a b || framework_failure_
+ln a c || framework_failure_
 
 
 # ======================================
diff --git a/tests/mv/hard-3 b/tests/mv/hard-3
index 586c593c9..8b76c28e4 100755
--- a/tests/mv/hard-3
+++ b/tests/mv/hard-3
@@ -34,12 +34,12 @@
 print_ver_ cp
 skip_if_root_
 
-mkdir -p x dst/x || framework_failure
-touch dst/x/b || framework_failure
+mkdir -p x dst/x || framework_failure_
+touch dst/x/b || framework_failure_
 chmod a-w dst/x
-touch a || framework_failure
-ln a x/b || framework_failure
-ln a c || framework_failure
+touch a || framework_failure_
+ln a x/b || framework_failure_
+ln a c || framework_failure_
 
 
 # ======================================
diff --git a/tests/mv/hard-4 b/tests/mv/hard-4
index 6cc640459..013de0f4b 100755
--- a/tests/mv/hard-4
+++ b/tests/mv/hard-4
@@ -18,8 +18,8 @@
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
-touch a || framework_failure
-ln a b || framework_failure
+touch a || framework_failure_
+ln a b || framework_failure_
 
 
 mv a b || fail=1
diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1
index 7014196ad..3b6fe25f6 100755
--- a/tests/mv/hard-link-1
+++ b/tests/mv/hard-link-1
@@ -24,9 +24,9 @@ cleanup_() { rm -rf "$other_partition_tmpdir"; }
 
 dir=hlink
 
-mkdir $dir || framework_failure
-> $dir/a || framework_failure
-ln $dir/a $dir/b || framework_failure
+mkdir $dir || framework_failure_
+> $dir/a || framework_failure_
+ln $dir/a $dir/b || framework_failure_
 
 mv $dir "$other_partition_tmpdir" || fail=1
 
diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose
index 27e8a92ad..95d959d57 100755
--- a/tests/mv/hard-verbose
+++ b/tests/mv/hard-verbose
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-touch x || framework_failure
-ln x y || framework_failure
+touch x || framework_failure_
+ln x y || framework_failure_
 
 
 mv --verbose x y > out || fail=1
diff --git a/tests/mv/i-2 b/tests/mv/i-2
index 6eef6f6db..538e12823 100755
--- a/tests/mv/i-2
+++ b/tests/mv/i-2
@@ -23,10 +23,10 @@ print_ver_ cp mv
 skip_if_root_
 
 for i in a b c d e f g h; do
-  echo $i > $i || framework_failure
+  echo $i > $i || framework_failure_
 done
-chmod 0 b d f h || framework_failure
-echo y > y || framework_failure
+chmod 0 b d f h || framework_failure_
+echo y > y || framework_failure_
 
 mv -if a b || fail=1
 mv -fi c d < y >/dev/null 2>&1 || fail=1
diff --git a/tests/mv/i-3 b/tests/mv/i-3
index 867b7cb62..a65c3b575 100755
--- a/tests/mv/i-3
+++ b/tests/mv/i-3
@@ -25,8 +25,8 @@ trap '' TTIN # Ignore SIGTTIN
 
 test "$(uname -s)" = FreeBSD && skip_ "known spurious failure on FreeBSD"
 
-touch f g h i || framework_failure
-chmod 0 g i || framework_failure
+touch f g h i || framework_failure_
+chmod 0 g i || framework_failure_
 
 
 ls /dev/stdin >/dev/null 2>&1 \
diff --git a/tests/mv/i-4 b/tests/mv/i-4
index f91f6bfc5..e7a381f6b 100755
--- a/tests/mv/i-4
+++ b/tests/mv/i-4
@@ -20,9 +20,9 @@
 print_ver_ mv
 
 for i in a b; do
-  echo $i > $i || framework_failure
+  echo $i > $i || framework_failure_
 done
-echo y > y || framework_failure
+echo y > y || framework_failure_
 
 mv -i a b < y >/dev/null 2>&1 || fail=1
 
diff --git a/tests/mv/i-5 b/tests/mv/i-5
index 64c06fe92..82596b9e0 100755
--- a/tests/mv/i-5
+++ b/tests/mv/i-5
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-mkdir a || framework_failure
-touch b || framework_failure
+mkdir a || framework_failure_
+touch b || framework_failure_
 
 
 # coreutils 6.2 mv would neglect to prompt in this case.
diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no
index 9ead3bcc8..7858eb91b 100755
--- a/tests/mv/i-link-no
+++ b/tests/mv/i-link-no
@@ -19,13 +19,13 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-mkdir a b || framework_failure
-echo foo > a/foo || framework_failure
-ln a/foo a/bar || framework_failure
-echo FUBAR > b/FUBAR || framework_failure
-ln b/FUBAR b/bar || framework_failure
-chmod a-w b/bar || framework_failure
-echo n > no || framework_failure
+mkdir a b || framework_failure_
+echo foo > a/foo || framework_failure_
+ln a/foo a/bar || framework_failure_
+echo FUBAR > b/FUBAR || framework_failure_
+ln b/FUBAR b/bar || framework_failure_
+chmod a-w b/bar || framework_failure_
+echo n > no || framework_failure_
 
 
 mv a/bar a/foo b < no > out 2> err || fail=1
diff --git a/tests/mv/into-self b/tests/mv/into-self
index 67e601239..a4df10a6b 100755
--- a/tests/mv/into-self
+++ b/tests/mv/into-self
@@ -22,9 +22,9 @@ print_ver_ mv
 dir=toself-dir
 file=toself-file
 
-rm -rf $dir $file || framework_failure
-mkdir -p $dir/a/b || framework_failure
-touch $file || framework_failure
+rm -rf $dir $file || framework_failure_
+mkdir -p $dir/a/b || framework_failure_
+touch $file || framework_failure_
 
 
 # This mv command should fail.
diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2
index a2939d998..28e212768 100755
--- a/tests/mv/into-self-2
+++ b/tests/mv/into-self-2
@@ -27,8 +27,8 @@ file="$other_partition_tmpdir/file"
 symlink=symlink
 
 
-echo whatever > $file || framework_failure
-ln -s $file $symlink || framework_failure
+echo whatever > $file || framework_failure_
+ln -s $file $symlink || framework_failure_
 
 # This mv command should exit nonzero.
 mv $symlink $file > out 2>&1 && fail=1
diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3
index a934ea247..8d1eadb5f 100755
--- a/tests/mv/into-self-3
+++ b/tests/mv/into-self-3
@@ -22,7 +22,7 @@ print_ver_ mv
 dir1=is3-dir1
 dir2=is3-dir2
 
-mkdir $dir1 $dir2 || framework_failure
+mkdir $dir1 $dir2 || framework_failure_
 
 # This mv command should exit nonzero.
 mv $dir1 $dir2 $dir2 > out 2>&1 && fail=1
diff --git a/tests/mv/into-self-4 b/tests/mv/into-self-4
index 6af1f8abb..7a3546e47 100755
--- a/tests/mv/into-self-4
+++ b/tests/mv/into-self-4
@@ -20,8 +20,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-touch file || framework_failure
-ln -s file s || framework_failure
+touch file || framework_failure_
+ln -s file s || framework_failure_
 
 
 # This must fail.
diff --git a/tests/mv/leak-fd b/tests/mv/leak-fd
index 095a843d5..881d7ee47 100755
--- a/tests/mv/leak-fd
+++ b/tests/mv/leak-fd
@@ -38,11 +38,11 @@ for i in `echo $b`; do
     echo $i$j
   done
 done > .dirs
-mkdir `cat .dirs` || framework_failure
+mkdir `cat .dirs` || framework_failure_
 sed 's,$,/f,' .dirs | xargs touch
 
 last_file=`tail -n1 .dirs`/f
-test -f $last_file || framework_failure
+test -f $last_file || framework_failure_
 
 
 mv * "$other_partition_tmpdir" || fail=1
diff --git a/tests/mv/mv-n b/tests/mv/mv-n
index 8d9e0da2e..ada2ade63 100755
--- a/tests/mv/mv-n
+++ b/tests/mv/mv-n
@@ -21,37 +21,37 @@ print_ver_ mv
 
 
 # test miscellaneous combinations of -f -i -n parameters
-touch a b || framework_failure
+touch a b || framework_failure_
 echo "\`a' -> \`b'" > out_move
 > out_empty
 
 # ask for overwrite, answer no
-touch a b || framework_failure
+touch a b || framework_failure_
 echo n | mv -vi a b 2>/dev/null > out1 || fail=1
 compare out1 out_empty || fail=1
 
 # ask for overwrite, answer yes
-touch a b || framework_failure
+touch a b || framework_failure_
 echo y | mv -vi a b 2>/dev/null > out2 || fail=1
 compare out2 out_move || fail=1
 
 # -n wins (as the last option)
-touch a b || framework_failure
+touch a b || framework_failure_
 echo y | mv -vin a b 2>/dev/null > out3 || fail=1
 compare out3 out_empty || fail=1
 
 # -n wins (as the last option)
-touch a b || framework_failure
+touch a b || framework_failure_
 echo y | mv -vfn a b 2>/dev/null > out4 || fail=1
 compare out4 out_empty || fail=1
 
 # -n wins (as the last option)
-touch a b || framework_failure
+touch a b || framework_failure_
 echo y | mv -vifn a b 2>/dev/null > out5 || fail=1
 compare out5 out_empty || fail=1
 
 # options --backup and --no-clobber are mutually exclusive
-touch a || framework_failure
+touch a || framework_failure_
 mv -bn a b 2>/dev/null && fail=1
 
 Exit $fail
diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1
index 429795313..f43a70791 100755
--- a/tests/mv/mv-special-1
+++ b/tests/mv/mv-special-1
@@ -24,11 +24,11 @@ cleanup_() { rm -rf "$other_partition_tmpdir"; }
 null=mv-null
 dir=mv-dir
 
-rm -f $null || framework_failure
-mknod $null p || framework_failure
-test -p $null || framework_failure
-mkdir -p $dir/a/b/c $dir/d/e/f || framework_failure
-touch $dir/a/b/c/file1 $dir/d/e/f/file2 || framework_failure
+rm -f $null || framework_failure_
+mknod $null p || framework_failure_
+test -p $null || framework_failure_
+mkdir -p $dir/a/b/c $dir/d/e/f || framework_failure_
+touch $dir/a/b/c/file1 $dir/d/e/f/file2 || framework_failure_
 
 # We used to...
 # exit 77 here to indicate that we couldn't run the test.
diff --git a/tests/mv/no-target-dir b/tests/mv/no-target-dir
index a73fae9ed..1d800e17f 100755
--- a/tests/mv/no-target-dir
+++ b/tests/mv/no-target-dir
@@ -20,11 +20,11 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-mkdir -p d/sub empty src d2/sub e2 || framework_failure
-touch f || framework_failure
+mkdir -p d/sub empty src d2/sub e2 || framework_failure_
+touch f || framework_failure_
 
 # Skip this test if there's an underlying kernel bug.
-mkdir a b b/a || framework_failure
+mkdir a b b/a || framework_failure_
 
 mv a b ||
   skip_ "your kernel's rename syscall is buggy"
diff --git a/tests/mv/part-fail b/tests/mv/part-fail
index 2c0d0e5b3..8d2566964 100755
--- a/tests/mv/part-fail
+++ b/tests/mv/part-fail
@@ -25,8 +25,8 @@ skip_if_root_
 cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; }
 . "$abs_srcdir/other-fs-tmpdir"
 
-touch k "$other_partition_tmpdir/k" || framework_failure
-chmod u-w "$other_partition_tmpdir" || framework_failure
+touch k "$other_partition_tmpdir/k" || framework_failure_
+chmod u-w "$other_partition_tmpdir" || framework_failure_
 
 
 mv -f k "$other_partition_tmpdir" 2> out && fail=1
diff --git a/tests/mv/part-hardlink b/tests/mv/part-hardlink
index 5c975fd43..5e27ff35b 100755
--- a/tests/mv/part-hardlink
+++ b/tests/mv/part-hardlink
@@ -24,11 +24,11 @@ print_ver_ mv
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
 . "$abs_srcdir/other-fs-tmpdir"
 
-touch f || framework_failure
-ln f g || framework_failure
-mkdir a b || framework_failure
-touch a/1 || framework_failure
-ln a/1 b/1 || framework_failure
+touch f || framework_failure_
+ln f g || framework_failure_
+mkdir a b || framework_failure_
+touch a/1 || framework_failure_
+ln a/1 b/1 || framework_failure_
 
 
 mv f g "$other_partition_tmpdir" || fail=1
diff --git a/tests/mv/part-rename b/tests/mv/part-rename
index 9edb2516a..e3a7db1da 100755
--- a/tests/mv/part-rename
+++ b/tests/mv/part-rename
@@ -23,7 +23,7 @@ print_ver_ mv
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
 . "$abs_srcdir/other-fs-tmpdir"
 
-mkdir foo || framework_failure
+mkdir foo || framework_failure_
 
 
 mv foo/ "$other_partition_tmpdir/bar" || fail=1
diff --git a/tests/mv/perm-1 b/tests/mv/perm-1
index 2366bd79e..cab0076f2 100755
--- a/tests/mv/perm-1
+++ b/tests/mv/perm-1
@@ -21,8 +21,8 @@
 print_ver_ mv
 skip_if_root_
 
-mkdir -p no-write/dir || framework_failure
-chmod u-w no-write || framework_failure
+mkdir -p no-write/dir || framework_failure_
+chmod u-w no-write || framework_failure_
 
 
 mv no-write/dir . > out 2>&1 && fail=1
diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart
index f689d9d0a..3d61c3c27 100755
--- a/tests/mv/sticky-to-xpart
+++ b/tests/mv/sticky-to-xpart
@@ -30,14 +30,14 @@ cleanup_() { rm -rf "$other_partition_tmpdir"; }
 # file from a sticky tmpdir to a directory owned by that user on
 # a different partition.
 
-mkdir t || framework_failure
-chmod a=rwx,o+t t || framework_failure
-echo > t/root-owned || framework_failure
-chmod a+r t/root-owned || framework_failure
-chown "$NON_ROOT_USERNAME" "$other_partition_tmpdir" || framework_failure
+mkdir t || framework_failure_
+chmod a=rwx,o+t t || framework_failure_
+echo > t/root-owned || framework_failure_
+chmod a+r t/root-owned || framework_failure_
+chown "$NON_ROOT_USERNAME" "$other_partition_tmpdir" || framework_failure_
 
 # We have to allow $NON_ROOT_USERNAME access to ".".
-chmod go+x . || framework_failure
+chmod go+x . || framework_failure_
 
 
 # Ensure that $NON_ROOT_USERNAME can access the required version of mv.
diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink
index 600fde35f..162ac55cd 100755
--- a/tests/mv/to-symlink
+++ b/tests/mv/to-symlink
@@ -26,9 +26,9 @@ rem_file="$other_partition_tmpdir/file"
 rem_symlink="$other_partition_tmpdir/symlink"
 file=to-sym
 
-echo local > $file || framework_failure
-echo remote > $rem_file || framework_failure
-ln -s $rem_file $rem_symlink || framework_failure
+echo local > $file || framework_failure_
+echo remote > $rem_file || framework_failure_
+ln -s $rem_file $rem_symlink || framework_failure_
 
 # This mv command should succeed, unlinking the symlink
 # before copying.
diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash
index 6215b149b..104cf594c 100755
--- a/tests/mv/trailing-slash
+++ b/tests/mv/trailing-slash
@@ -22,7 +22,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ mv
 
-mkdir foo || framework_failure
+mkdir foo || framework_failure_
 
 
 mv foo/ bar || fail=1
@@ -30,8 +30,8 @@ mv foo/ bar || fail=1
 # mv and cp would misbehave for coreutils versions [5.3.0..5.97], 6.0 and 6.1
 for cmd in mv 'cp -r'; do
   for opt in '' -T -u; do
-    rm -rf d e || framework_failure
-    mkdir d    || framework_failure
+    rm -rf d e || framework_failure_
+    mkdir d    || framework_failure_
 
     $cmd $opt d e/ || fail=1
     if test "$cmd" = mv; then
diff --git a/tests/mv/update b/tests/mv/update
index 6a746ec85..0f8ac8927 100755
--- a/tests/mv/update
+++ b/tests/mv/update
@@ -19,9 +19,9 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp mv
 
-echo old > old || framework_failure
-touch -d yesterday old || framework_failure
-echo new > new || framework_failure
+echo old > old || framework_failure_
+touch -d yesterday old || framework_failure_
+echo new > new || framework_failure_
 
 
 for interactive in '' -i; do