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/ln/hard-to-sym | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/ln/hard-to-sym')

diff --git a/tests/ln/hard-to-sym b/tests/ln/hard-to-sym
index 72d8e2734..64626f46c 100755
--- a/tests/ln/hard-to-sym
+++ b/tests/ln/hard-to-sym
@@ -22,7 +22,7 @@ print_ver_ ln
 
 # ===================================================
 # ensure -s silently overrides -L, -P
-touch a || framework_failure
+touch a || framework_failure_
 ln -L -s a symlink1 || fail=1
 ln -P -s symlink1 symlink2 || fail=1
 ln -s -L -P symlink2 symlink3 || fail=1
@@ -34,7 +34,7 @@ ls=`ls -lG hard-to-a`x
 case "$ls" in
   *'hard-to-ax') ;;
   *'hard-to-a -> '*x) fail=1 ;;
-  *) framework_failure ;;
+  *) framework_failure_ ;;
 esac
 
 # ===================================================
@@ -45,12 +45,12 @@ case "$ls" in
   *'hard-to-3 -> symlink2x') ;;
   *'hard-to-3x') fail=1 ;;
   *'hard-to-3 -> '*x) fail=1 ;;
-  *) framework_failure ;;
+  *) framework_failure_ ;;
 esac
 
 # ===================================================
 # Create a hard link to a dangling symlink.
-ln -s /no-such-dir || framework_failure
+ln -s /no-such-dir || framework_failure_
 ln -L no-such-dir hard-to-dangle 2>err && fail=1
 case `cat err` in
   *' accessing `no-such-dir'\':*) ;;
@@ -60,8 +60,8 @@ ln -P no-such-dir hard-to-dangle || fail=1
 
 # ===================================================
 # Create a hard link to a symlink to a directory.
-mkdir d || framework_failure
-ln -s d link-to-dir || framework_failure
+mkdir d || framework_failure_
+ln -s d link-to-dir || framework_failure_
 ln -L link-to-dir hard-to-dir-link 2>err && fail=1
 case `cat err` in
   *': `link-to-dir'\'': hard link not allowed for directory'*) ;;
-- 
cgit v1.2.3-54-g00ecf