From 554caaf6ffc721fe83debe0eb5e555136b01f0bb Mon Sep 17 00:00:00 2001 From: Stefano Lattarini 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/rm/interactive-always | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/rm/interactive-always') 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 -- cgit v1.2.3-70-g09d2