diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-08-04 20:52:31 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-08-08 10:11:48 +0200 |
| commit | 554caaf6ffc721fe83debe0eb5e555136b01f0bb (patch) | |
| tree | 3434c8a4fca2cdac2ec5fca8bd808bd17a6f4d30 /tests/mv/acl | |
| parent | 8e2767a3f0c279d355f067e53be2c63173959eb1 (diff) | |
| download | coreutils-554caaf6ffc721fe83debe0eb5e555136b01f0bb.tar.xz | |
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.
Diffstat (limited to 'tests/mv/acl')
| -rwxr-xr-x | tests/mv/acl | 22 |
1 files changed, 11 insertions, 11 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 |