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/du/basic                     |  4 ++--
 tests/du/deref                     | 10 +++++-----
 tests/du/deref-args                |  8 ++++----
 tests/du/exclude                   |  2 +-
 tests/du/fd-leak                   |  2 +-
 tests/du/inacc-dest                |  2 +-
 tests/du/inacc-dir                 |  2 +-
 tests/du/inaccessible-cwd          |  6 +++---
 tests/du/long-from-unreadable      | 14 +++++++-------
 tests/du/long-sloop                |  4 ++--
 tests/du/move-dir-while-traversing |  4 ++--
 tests/du/no-deref                  |  4 ++--
 tests/du/no-x                      |  4 ++--
 tests/du/one-file-system           |  2 +-
 tests/du/restore-wd                |  2 +-
 tests/du/trailing-slash            |  4 ++--
 tests/du/two-args                  |  6 +++---
 17 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'tests/du')

diff --git a/tests/du/basic b/tests/du/basic
index e12ff1e1a..3cb3c0d99 100755
--- a/tests/du/basic
+++ b/tests/du/basic
@@ -19,12 +19,12 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ du
 
-mkdir -p a/b d d/sub || framework_failure
+mkdir -p a/b d d/sub || framework_failure_
 
 # Ensure that these files contain more than 64 bytes, so that we don't
 # immediately disqualify file systems (e.g., NetApp) on which smaller
 # files take up zero disk blocks.
-printf '%*s' 257 make-sure-the-file-is-non-empty > a/b/F || framework_failure
+printf '%*s' 257 make-sure-the-file-is-non-empty > a/b/F || framework_failure_
 printf %4096s x > d/1
 cp d/1 d/sub/2
 
diff --git a/tests/du/deref b/tests/du/deref
index ebd9c18ae..63837939f 100755
--- a/tests/du/deref
+++ b/tests/du/deref
@@ -22,11 +22,11 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ du
 
-mkdir -p a/sub || framework_failure
-ln -s a/sub slink || framework_failure
-touch b || framework_failure
-ln -s .. a/sub/dotdot || framework_failure
-ln -s nowhere dangle || framework_failure
+mkdir -p a/sub || framework_failure_
+ln -s a/sub slink || framework_failure_
+touch b || framework_failure_
+ln -s .. a/sub/dotdot || framework_failure_
+ln -s nowhere dangle || framework_failure_
 
 
 # This used to fail with the following diagnostic:
diff --git a/tests/du/deref-args b/tests/du/deref-args
index 767f94e7a..474f7d06c 100755
--- a/tests/du/deref-args
+++ b/tests/du/deref-args
@@ -20,10 +20,10 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ du
 
-mkdir -p dir/a || framework_failure
-ln -s dir slink || framework_failure
-printf %65536s x > 64k || framework_failure
-ln -s 64k slink-to-64k || framework_failure
+mkdir -p dir/a || framework_failure_
+ln -s dir slink || framework_failure_
+printf %65536s x > 64k || framework_failure_
+ln -s 64k slink-to-64k || framework_failure_
 
 
 du -D slink | sed 's/^[0-9][0-9]*	//' > out
diff --git a/tests/du/exclude b/tests/du/exclude
index 580454d72..7403f5d04 100755
--- a/tests/du/exclude
+++ b/tests/du/exclude
@@ -19,7 +19,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ du
 
-mkdir -p a/b/c a/x/y a/u/v || framework_failure
+mkdir -p a/b/c a/x/y a/u/v || framework_failure_
 
 
 du --exclude=x a | sed 's/^[0-9][0-9]*	//' | sort > out || fail=1
diff --git a/tests/du/fd-leak b/tests/du/fd-leak
index 65933b254..ad744a8c0 100755
--- a/tests/du/fd-leak
+++ b/tests/du/fd-leak
@@ -34,7 +34,7 @@ for i in $x; do
 done
 
 # This may fail due to command line limitations.
-touch $f || framework_failure
+touch $f || framework_failure_
 
 
 # With coreutils-5.0, this would fail due to a file descriptor leak.
diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest
index 73f5d6665..fac7e0ede 100755
--- a/tests/du/inacc-dest
+++ b/tests/du/inacc-dest
@@ -22,7 +22,7 @@ print_ver_ du
 skip_if_root_
 
 mkdir f && cd f && mkdir a b c d e && touch c/j && chmod a-x c \
-    || framework_failure
+    || framework_failure_
 
 du > ../t 2>&1 && fail=1
 
diff --git a/tests/du/inacc-dir b/tests/du/inacc-dir
index 2eb40ddb2..c160fbbf5 100755
--- a/tests/du/inacc-dir
+++ b/tests/du/inacc-dir
@@ -19,7 +19,7 @@
 print_ver_ du
 skip_if_root_
 
-mkdir -p a/sub || framework_failure
+mkdir -p a/sub || framework_failure_
 
 
 du -s a > exp || fail=1
diff --git a/tests/du/inaccessible-cwd b/tests/du/inaccessible-cwd
index 220ac7b4f..2f16782d1 100755
--- a/tests/du/inaccessible-cwd
+++ b/tests/du/inaccessible-cwd
@@ -25,9 +25,9 @@ print_ver_ du
 skip_if_root_
 
 cwd=`pwd`
-mkdir -p no-x a/b || framework_failure
-cd no-x || framework_failure
-chmod 0 . || framework_failure
+mkdir -p no-x a/b || framework_failure_
+cd no-x || framework_failure_
+chmod 0 . || framework_failure_
 
 
 du "$cwd/a" > /dev/null || fail=1
diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable
index 92cd3788c..8523963fb 100755
--- a/tests/du/long-from-unreadable
+++ b/tests/du/long-from-unreadable
@@ -41,10 +41,10 @@ dir=`printf '%200s\n' ' '|tr ' ' x`
 # Construct a hierarchy containing a relative file with a name
 # longer than PATH_MAX.
 # for i in `seq 52`; do
-#   mkdir $dir || framework_failure
-#   cd $dir || framework_failure
+#   mkdir $dir || framework_failure_
+#   cd $dir || framework_failure_
 # done
-# cd $tmp || framework_failure
+# cd $tmp || framework_failure_
 
 # Sheesh.  Bash 3.1.5 can't create this hierarchy.  I get
 #   cd: error retrieving current directory: getcwd:
@@ -57,11 +57,11 @@ cwd=`pwd`
 $PERL \
     -e 'my $d = '$dir'; foreach my $i (1..52)' \
     -e '  { mkdir ($d, 0700) && chdir $d or die "$!" }' \
-  || framework_failure
+  || framework_failure_
 
-mkdir inaccessible || framework_failure
-cd inaccessible || framework_failure
-chmod 0 . || framework_failure
+mkdir inaccessible || framework_failure_
+cd inaccessible || framework_failure_
+chmod 0 . || framework_failure_
 
 du -s "$cwd/$dir" > /dev/null || fail=1
 
diff --git a/tests/du/long-sloop b/tests/du/long-sloop
index 1f46a4a40..6c1d8d5de 100755
--- a/tests/du/long-sloop
+++ b/tests/du/long-sloop
@@ -30,14 +30,14 @@ print_ver_ du
 n=400
 
 dir_list=`seq $n`
-mkdir $dir_list || framework_failure
+mkdir $dir_list || framework_failure_
 file=1
 i_minus_1=0
 for i in $dir_list `expr $n + 1`; do
   case $i_minus_1 in
   0) ;;
   *)
-    ln -s ../$i $i_minus_1/s || framework_failure
+    ln -s ../$i $i_minus_1/s || framework_failure_
     file=$file/s;;
   esac
   i_minus_1=$i
diff --git a/tests/du/move-dir-while-traversing b/tests/du/move-dir-while-traversing
index 68302b8ff..322a9a593 100755
--- a/tests/du/move-dir-while-traversing
+++ b/tests/du/move-dir-while-traversing
@@ -59,7 +59,7 @@ EOF
 chmod a+x inotify-watch-for-dir-access.py
 
 t=T/U
-mkdir d2 || framework_failure
+mkdir d2 || framework_failure_
 long=d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z
 # One iteration of this loop creates a tree with which
 # du sometimes completes its traversal before the above rename.
@@ -68,7 +68,7 @@ long=d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z
 # Using 10 iterations was not enough, either.
 # Using 30, I saw no failure in 200 trials.
 for i in $(seq 30); do
-  mkdir -p $t/3/a/b/c/$i/$long || framework_failure
+  mkdir -p $t/3/a/b/c/$i/$long || framework_failure_
 done
 
 # Prohibit suspension, which could otherwise cause a timeout-induced FP failure.
diff --git a/tests/du/no-deref b/tests/du/no-deref
index 2abad5fc5..09a1dcc41 100755
--- a/tests/du/no-deref
+++ b/tests/du/no-deref
@@ -19,8 +19,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ du
 
-mkdir -p dir/a/b || framework_failure
-ln -s dir slink || framework_failure
+mkdir -p dir/a/b || framework_failure_
+ln -s dir slink || framework_failure_
 
 
 du slink | sed 's/^[0-9][0-9]*	//' > out
diff --git a/tests/du/no-x b/tests/du/no-x
index de3417f82..e45f317e0 100755
--- a/tests/du/no-x
+++ b/tests/du/no-x
@@ -21,8 +21,8 @@
 print_ver_ du
 skip_if_root_
 
-mkdir -p d/no-x/y || framework_failure
-chmod u=rw d/no-x || framework_failure
+mkdir -p d/no-x/y || framework_failure_
+chmod u=rw d/no-x || framework_failure_
 
 
 # This must exit nonzero.
diff --git a/tests/du/one-file-system b/tests/du/one-file-system
index b4c631896..8a57c9934 100755
--- a/tests/du/one-file-system
+++ b/tests/du/one-file-system
@@ -20,7 +20,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ du
 
-mkdir -p b/c y/z || framework_failure
+mkdir -p b/c y/z || framework_failure_
 
 
 # Due to a used-uninitialized variable, the "du -x" from coreutils-6.6
diff --git a/tests/du/restore-wd b/tests/du/restore-wd
index 032413ae0..01fa0646b 100755
--- a/tests/du/restore-wd
+++ b/tests/du/restore-wd
@@ -20,7 +20,7 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ du
 
-mkdir a b || framework_failure
+mkdir a b || framework_failure_
 
 
 # With du from coreutils-4.5.5 and 4.5.6, this would fail with
diff --git a/tests/du/trailing-slash b/tests/du/trailing-slash
index 21045bd7f..7c97ccec9 100755
--- a/tests/du/trailing-slash
+++ b/tests/du/trailing-slash
@@ -22,8 +22,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ du
 
-mkdir -p dir/1/2 || framework_failure
-ln -s dir slink || framework_failure
+mkdir -p dir/1/2 || framework_failure_
+ln -s dir slink || framework_failure_
 
 
 du slink/ | sed 's/^[0-9][0-9]*	//' > out
diff --git a/tests/du/two-args b/tests/du/two-args
index 4f15d62ea..89a1461bc 100755
--- a/tests/du/two-args
+++ b/tests/du/two-args
@@ -23,11 +23,11 @@ print_ver_ du
 # Run this test from a sub-directory one level deeper than normal,
 # so that the "du .." below doesn't traverse sibling directories
 # that may be inaccessible due concurrently-running tests.
-mkdir sub || framework_failure
-cd sub || framework_failure
+mkdir sub || framework_failure_
+cd sub || framework_failure_
 
 t=t
-mkdir -p $t/1 $t/2 || framework_failure
+mkdir -p $t/1 $t/2 || framework_failure_
 
 test -d $t || fail=1
 du $t/1 $t/2 > /dev/null || fail=1
-- 
cgit v1.2.3-70-g09d2