33 files changed, 84 insertions, 84 deletions
diff --git a/tests/rm/deep-2 b/tests/rm/deep-2
index eb624eeb2..b7651da32 100755
--- a/tests/rm/deep-2
+++ b/tests/rm/deep-2
@@ -24,18 +24,18 @@ print_ver_ rm
 # the offending euidaccess_stat call.
 skip_if_root_
 
-mkdir x || framework_failure
-cd x || framework_failure
+mkdir x || framework_failure_
+cd x || framework_failure_
 
 # Construct a hierarchy containing a relative file with a name
 : ${PERL=perl}
 $PERL \
     -e 'my $d = "x" x 200; foreach my $i (1..52)' \
     -e '  { mkdir ($d, 0700) && chdir $d or die "$!" }' \
-  || framework_failure
+  || framework_failure_
 
-cd .. || framework_failure
-echo n > no || framework_failure
+cd .. || framework_failure_
+echo n > no || framework_failure_
 
 rm ---presume-input-tty -r x < no > out || fail=1
 
diff --git a/tests/rm/dir-no-w b/tests/rm/dir-no-w
index 292836b54..b4721ad4e 100755
--- a/tests/rm/dir-no-w
+++ b/tests/rm/dir-no-w
@@ -20,7 +20,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir --mode=0500 unwritable-dir || framework_failure
+mkdir --mode=0500 unwritable-dir || framework_failure_
 
 
 # For rm from coreutils-5.0.1, this would prompt.
diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur
index 1b347d957..2e2f15237 100755
--- a/tests/rm/dir-nonrecur
+++ b/tests/rm/dir-nonrecur
@@ -20,7 +20,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir d || framework_failure
+mkdir d || framework_failure_
 
 
 rm d 2> out && fail=1
diff --git a/tests/rm/dot-rel b/tests/rm/dot-rel
index dd23b373c..fdf4fc174 100755
--- a/tests/rm/dot-rel
+++ b/tests/rm/dot-rel
@@ -20,8 +20,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir a b || framework_failure
-touch a/f b/f || framework_failure
+mkdir a b || framework_failure_
+touch a/f b/f || framework_failure_
 
 
 rm -r a b || fail=1
diff --git a/tests/rm/empty-inacc b/tests/rm/empty-inacc
index 20abd5c72..f36c6f2d6 100755
--- a/tests/rm/empty-inacc
+++ b/tests/rm/empty-inacc
@@ -20,7 +20,7 @@
 print_ver_ rm
 skip_if_root_
 
-mkdir -m0 inacc || framework_failure
+mkdir -m0 inacc || framework_failure_
 
 # Also exercise the different code path that's taken for a directory
 # that is empty (hence removable) and unreadable.
diff --git a/tests/rm/ext3-perf b/tests/rm/ext3-perf
index 95cce33d4..1ee8bf944 100755
--- a/tests/rm/ext3-perf
+++ b/tests/rm/ext3-perf
@@ -44,7 +44,7 @@ df -T -t ext3 -t ext4dev -t ext4 . \
   || skip_ 'this test runs only on an ext3 or ext4 file system'
 
 # Skip if there are too few inodes free.  Require some slack.
-free_inodes=$(stat -f --format=%d .) || framework_failure
+free_inodes=$(stat -f --format=%d .) || framework_failure_
 min_free_inodes=$(expr 12 \* $n / 10)
 test $min_free_inodes -lt $free_inodes \
   || skip_ "too few free inodes on '.': $free_inodes;" \
@@ -59,7 +59,7 @@ mkdir d &&
     test -f $n &&
   cd .. &&
   ok=1
-test $ok = 1 || framework_failure
+test $ok = 1 || framework_failure_
 setup_duration=$(expr $(date +%s) - $start)
 echo creating a $n-entry directory took $setup_duration seconds
 
diff --git a/tests/rm/f-1 b/tests/rm/f-1
index 3b0d51537..2d353649c 100755
--- a/tests/rm/f-1
+++ b/tests/rm/f-1
@@ -21,7 +21,7 @@ test=f-1
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir -p d || framework_failure
+mkdir -p d || framework_failure_
 
 rm -f d/no-such-file || fail=1
 
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index 4137d9dac..cd294c5bc 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -24,9 +24,9 @@ require_root_
 # The containing directory must be owned by the user who eventually runs rm.
 chown $NON_ROOT_USERNAME .
 
-mkdir a || framework_failure
-chmod 1777 a || framework_failure
-touch a/b || framework_failure
+mkdir a || framework_failure_
+chmod 1777 a || framework_failure_
+touch a/b || framework_failure_
 
 
 # Try to ensure that $NON_ROOT_USERNAME can access
diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces
index 750924f62..8e9b5b07e 100755
--- a/tests/rm/fail-eacces
+++ b/tests/rm/fail-eacces
@@ -29,13 +29,13 @@ mkdir d           &&
   ln -s f d/slink &&
   chmod a-w d     &&
   ok=1
-test $ok = 1 || framework_failure
+test $ok = 1 || framework_failure_
 
 mkdir e           &&
   ln -s f e/slink &&
   chmod a-w e     &&
   ok=1
-test $ok = 1 || framework_failure
+test $ok = 1 || framework_failure_
 
 
 rm -rf d/f 2> out && fail=1
diff --git a/tests/rm/hash b/tests/rm/hash
index cdadbab70..48560ddf2 100755
--- a/tests/rm/hash
+++ b/tests/rm/hash
@@ -27,7 +27,7 @@ echo "$0: creating 78 trees, each of depth 153; this will take a while..." >&2
 y=`seq 1 150|tr -sc '\n' y|tr '\n' /`
 for i in 1 2 3; do
   for j in a b c d e f g h i j k l m n o p q r s t u v w x y z; do
-    mkdir -p t/$i/$j/$y || framework_failure
+    mkdir -p t/$i/$j/$y || framework_failure_
   done
 done
 
diff --git a/tests/rm/i-1 b/tests/rm/i-1
index 369f91263..e8e487672 100755
--- a/tests/rm/i-1
+++ b/tests/rm/i-1
@@ -22,9 +22,9 @@ test=i-1
 print_ver_ rm
 
 t=t
-mkdir -p $t || framework_failure
-echo > $t/a || framework_failure
-test -f $t/a || framework_failure
+mkdir -p $t || framework_failure_
+echo > $t/a || framework_failure_
+test -f $t/a || framework_failure_
 
 echo y > $t/$test.Iy
 echo n > $t/$test.In
diff --git a/tests/rm/i-never b/tests/rm/i-never
index c6dc080a0..5ffde73c7 100755
--- a/tests/rm/i-never
+++ b/tests/rm/i-never
@@ -21,9 +21,9 @@
 print_ver_ rm
 skip_if_root_
 
-touch f || framework_failure
-chmod 0 f || framework_failure
-touch exp || framework_failure
+touch f || framework_failure_
+chmod 0 f || framework_failure_
+touch exp || framework_failure_
 
 
 rm --interactive=never f > out || fail=1
diff --git a/tests/rm/i-no-r b/tests/rm/i-no-r
index 6e46d2238..9316b828f 100755
--- a/tests/rm/i-no-r
+++ b/tests/rm/i-no-r
@@ -21,8 +21,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir dir || framework_failure
-echo y > y || framework_failure
+mkdir dir || framework_failure_
+echo y > y || framework_failure_
 
 
 # This must fail.
diff --git a/tests/rm/ignorable b/tests/rm/ignorable
index 8c76f40a7..bff42f255 100755
--- a/tests/rm/ignorable
+++ b/tests/rm/ignorable
@@ -20,7 +20,7 @@
 print_ver_ rm
 skip_if_root_
 
-touch existing-non-dir || framework_failure
+touch existing-non-dir || framework_failure_
 
 
 # With coreutils-6.3, this would exit nonzero.  It should not.
diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible
index b5fa5881e..e87ab793d 100755
--- a/tests/rm/inaccessible
+++ b/tests/rm/inaccessible
@@ -26,7 +26,7 @@ require_openat_support_
 skip_if_root_
 
 p=`pwd`
-mkdir abs1 abs2 no-access || framework_failure
+mkdir abs1 abs2 no-access || framework_failure_
 
 
 set +x
diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always
index 7b9130a9d..032c645ed 100755
--- a/tests/rm/interactive-always
+++ b/tests/rm/interactive-always
@@ -22,11 +22,11 @@ test=interactive-always
 print_ver_ rm
 
 touch file1-1 file1-2 file2-1 file2-2 file3-1 file3-2 file4-1 file4-2 \
-  || framework_failure
+  || framework_failure_
 # If asked, answer no to first question, then yes to second.
 echo 'n
-y' > $test.I || framework_failure
-rm -f out err || framework_failure
+y' > $test.I || framework_failure_
+rm -f out err || framework_failure_
 
 
 # The prompt has a trailing space, and no newline, so an extra
diff --git a/tests/rm/interactive-once b/tests/rm/interactive-once
index 4971fe52f..fc1c76dd7 100755
--- a/tests/rm/interactive-once
+++ b/tests/rm/interactive-once
@@ -21,12 +21,12 @@ test=interactive-once
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir -p dir1-1 dir2-1 dir2-2 || framework_failure
+mkdir -p dir1-1 dir2-1 dir2-2 || framework_failure_
 touch file1-1 file2-1 file2-2 file2-3 file3-1 file3-2 file3-3 file3-4 \
-  || framework_failure
-echo y > $test.Iy || framework_failure
-echo n > $test.In || framework_failure
-rm -f out err || framework_failure
+  || framework_failure_
+echo y > $test.Iy || framework_failure_
+echo n > $test.In || framework_failure_
+rm -f out err || framework_failure_
 
 
 # The prompt has a trailing space, and no newline, so an extra
diff --git a/tests/rm/ir-1 b/tests/rm/ir-1
index bac607cb8..228770232 100755
--- a/tests/rm/ir-1
+++ b/tests/rm/ir-1
@@ -22,10 +22,10 @@ test=ir-1
 print_ver_ rm
 
 t=t
-mkdir -p $t $t/a $t/b $t/c || framework_failure
-> $t/a/a || framework_failure
-> $t/b/bb || framework_failure
-> $t/c/cc || framework_failure
+mkdir -p $t $t/a $t/b $t/c || framework_failure_
+> $t/a/a || framework_failure_
+> $t/b/bb || framework_failure_
+> $t/c/cc || framework_failure_
 
 cat <<EOF > $test.I
 y
diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up
index 5ecd2750f..544b8c241 100755
--- a/tests/rm/no-give-up
+++ b/tests/rm/no-give-up
@@ -21,12 +21,12 @@
 print_ver_ rm
 require_root_
 
-mkdir d || framework_failure
-touch d/f || framework_failure
-chown -R $NON_ROOT_USERNAME d || framework_failure
+mkdir d || framework_failure_
+touch d/f || framework_failure_
+chown -R $NON_ROOT_USERNAME d || framework_failure_
 
 # Ensure that non-root can access files in root-owned ".".
-chmod go=x . || framework_failure
+chmod go=x . || framework_failure_
 
 
 # This must fail, since `.' is not writable by $NON_ROOT_USERNAME.
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index 1ef61a735..064d27c2b 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -35,7 +35,7 @@ mkdir -p a/b $t/y
 mount --bind $t a/b \
   || skip_ "This test requires mount with a working --bind option."
 
-cat <<\EOF > exp || framework_failure
+cat <<\EOF > exp || framework_failure_
 rm: skipping `a/b', since it's on a different device
 EOF
 
diff --git a/tests/rm/r-1 b/tests/rm/r-1
index c415a3bf3..c1d04bd5c 100755
--- a/tests/rm/r-1
+++ b/tests/rm/r-1
@@ -22,10 +22,10 @@ test=r-1
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir a a/a || framework_failure
-> b || framework_failure
+mkdir a a/a || framework_failure_
+> b || framework_failure_
 
-cat <<\EOF > $test.E || framework_failure
+cat <<\EOF > $test.E || framework_failure_
 removed directory: `a/a'
 removed directory: `a'
 removed `b'
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index f38a181c4..71df2f0fe 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -20,12 +20,12 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir t t/a t/a/b || framework_failure
-> t/a/f || framework_failure
-> t/a/b/g || framework_failure
+mkdir t t/a t/a/b || framework_failure_
+> t/a/f || framework_failure_
+> t/a/b/g || framework_failure_
 
 # FIXME: if this fails, it's a framework failure
-cat <<\EOF | sort > t/E || framework_failure
+cat <<\EOF | sort > t/E || framework_failure_
 removed directory: `t/a'
 removed directory: `t/a/b'
 removed `t/a/b/g'
diff --git a/tests/rm/r-3 b/tests/rm/r-3
index 5372046f6..e47ee093e 100755
--- a/tests/rm/r-3
+++ b/tests/rm/r-3
@@ -26,8 +26,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir t || framework_failure
-cd t || framework_failure
+mkdir t || framework_failure_
+cd t || framework_failure_
 
 # Create 500 files (20 * 25).
 for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j; do
@@ -35,12 +35,12 @@ for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j; do
   for j in a b c d e f g h i j k l m n o p q r s t u v w x y; do
     files="$files $i$j"
   done
-  touch $files || framework_failure
+  touch $files || framework_failure_
 done
 
-test -f 0a || framework_failure
-test -f by || framework_failure
-cd .. || framework_failure
+test -f 0a || framework_failure_
+test -f by || framework_failure_
+cd .. || framework_failure_
 
 rm -rf t || fail=1
 test -d t && fail=1
diff --git a/tests/rm/r-4 b/tests/rm/r-4
index 9c6824d13..56135c42a 100755
--- a/tests/rm/r-4
+++ b/tests/rm/r-4
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir d || framework_failure
-touch d/a || framework_failure
+mkdir d || framework_failure_
+touch d/a || framework_failure_
 
 rm -fr d/. 2>/dev/null && fail=1
 rm -fr d/./ 2>/dev/null && fail=1
diff --git a/tests/rm/readdir-bug b/tests/rm/readdir-bug
index 3f1596728..41405ebf7 100755
--- a/tests/rm/readdir-bug
+++ b/tests/rm/readdir-bug
@@ -24,12 +24,12 @@ print_ver_ rm
 # What counts is a combination of the number of files and
 # the lengths of their names.  For details, see
 # http://lists.gnu.org/archive/html/bug-coreutils/2006-09/msg00326.html
-mkdir b || framework_failure
-cd b || framework_failure
+mkdir b || framework_failure_
+cd b || framework_failure_
 for i in `seq 1 250`; do
-  touch `printf %040d $i` || framework_failure
+  touch `printf %040d $i` || framework_failure_
 done
-cd .. || framework_failure
+cd .. || framework_failure_
 
 
 # On a buggy system, this would fail with the diagnostic,
diff --git a/tests/rm/rm1 b/tests/rm/rm1
index e90996d8f..ce0d87150 100755
--- a/tests/rm/rm1
+++ b/tests/rm/rm1
@@ -20,8 +20,8 @@
 print_ver_ rm
 skip_if_root_
 
-mkdir -p b/a/p b/c b/d || framework_failure
-chmod u-w b/a || framework_failure
+mkdir -p b/a/p b/c b/d || framework_failure_
+chmod u-w b/a || framework_failure_
 
 
 # This should fail.
diff --git a/tests/rm/rm2 b/tests/rm/rm2
index c73349f0b..0cd089291 100755
--- a/tests/rm/rm2
+++ b/tests/rm/rm2
@@ -20,10 +20,10 @@
 print_ver_ rm
 skip_if_root_
 
-mkdir -p a/0 || framework_failure
-mkdir -p a/1/2 b/3 || framework_failure
-mkdir a/2 a/3 || framework_failure
-chmod u-x a/1 b || framework_failure
+mkdir -p a/0 || framework_failure_
+mkdir -p a/1/2 b/3 || framework_failure_
+mkdir a/2 a/3 || framework_failure_
+chmod u-x a/1 b || framework_failure_
 
 
 # Exercise two separate code paths -- though both result
diff --git a/tests/rm/rm3 b/tests/rm/rm3
index 5e1eb71a4..56aea8c1e 100755
--- a/tests/rm/rm3
+++ b/tests/rm/rm3
@@ -20,14 +20,14 @@
 print_ver_ rm
 skip_if_root_
 
-mkdir -p z || framework_failure
-cd z || framework_failure
-touch empty empty-u || framework_failure
+mkdir -p z || framework_failure_
+cd z || framework_failure_
+touch empty empty-u || framework_failure_
 echo not-empty > fu
 ln -s empty-f slink
 ln -s . slinkdot
-mkdir d du || framework_failure
-chmod u-w fu du empty-u || framework_failure
+mkdir d du || framework_failure_
+chmod u-w fu du empty-u || framework_failure_
 cd ..
 
 
diff --git a/tests/rm/rm4 b/tests/rm/rm4
index a02cf740d..08ed64ad8 100755
--- a/tests/rm/rm4
+++ b/tests/rm/rm4
@@ -20,7 +20,7 @@
 print_ver_ rm
 skip_if_root_
 
-mkdir dir || framework_failure
+mkdir dir || framework_failure_
 
 
 # This should fail.
diff --git a/tests/rm/rm5 b/tests/rm/rm5
index 54d0e4ce9..5c33bf729 100755
--- a/tests/rm/rm5
+++ b/tests/rm/rm5
@@ -20,14 +20,14 @@
 print_ver_ rm
 skip_if_root_
 
-mkdir -p d/e || framework_failure
-cat <<EOF > in || framework_failure
+mkdir -p d/e || framework_failure_
+cat <<EOF > in || framework_failure_
 y
 y
 y
 EOF
 
-cat <<\EOF > exp || framework_failure
+cat <<\EOF > exp || framework_failure_
 rm: descend into directory `d'
 rm: remove directory `d/e'
 rm: remove directory `d'
diff --git a/tests/rm/unread2 b/tests/rm/unread2
index d41e7a72f..ae3365f25 100755
--- a/tests/rm/unread2
+++ b/tests/rm/unread2
@@ -20,7 +20,7 @@
 print_ver_ rm
 skip_if_root_
 
-mkdir -p a/b || framework_failure
+mkdir -p a/b || framework_failure_
 chmod u-r a
 
 
diff --git a/tests/rm/unread3 b/tests/rm/unread3
index 021662b08..7553af5c3 100755
--- a/tests/rm/unread3
+++ b/tests/rm/unread3
@@ -20,7 +20,7 @@
 print_ver_ rm
 skip_if_root_
 
-mkdir -p a/1 b c d/2 e/3 || framework_failure
+mkdir -p a/1 b c d/2 e/3 || framework_failure_
 
 
 t=`pwd`
diff --git a/tests/rm/v-slash b/tests/rm/v-slash
index ba3855333..6620742ec 100755
--- a/tests/rm/v-slash
+++ b/tests/rm/v-slash
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ rm
 
-mkdir a || framework_failure
-touch a/x || framework_failure
+mkdir a || framework_failure_
+touch a/x || framework_failure_
 
 
 rm --verbose -r a/// > out || fail=1