summaryrefslogtreecommitdiff
path: root/tests/cp/cp-a-selinux
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-08-04 20:52:31 +0200
committerJim Meyering <meyering@redhat.com>2011-08-08 10:11:48 +0200
commit554caaf6ffc721fe83debe0eb5e555136b01f0bb (patch)
tree3434c8a4fca2cdac2ec5fca8bd808bd17a6f4d30 /tests/cp/cp-a-selinux
parent8e2767a3f0c279d355f067e53be2c63173959eb1 (diff)
downloadcoreutils-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/cp/cp-a-selinux')
-rwxr-xr-xtests/cp/cp-a-selinux18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux
index 76684d6f4..8a8e37415 100755
--- a/tests/cp/cp-a-selinux
+++ b/tests/cp/cp-a-selinux
@@ -31,11 +31,11 @@ cleanup_() { cd /; umount "$cwd/mnt"; }
ctx=root:object_r:tmp_t:s0
# Check basic functionality - before check on fixed context mount
-touch c || framework_failure
-chcon $ctx c || framework_failure
-cp -a c d 2>err || framework_failure
-cp --preserve=context c e || framework_failure
-cp --preserve=all c f || framework_failure
+touch c || framework_failure_
+chcon $ctx c || framework_failure_
+cp -a c d 2>err || framework_failure_
+cp --preserve=context c e || framework_failure_
+cp --preserve=all c f || framework_failure_
ls -Z d | grep $ctx || fail=1
test -s err && fail=1 #there must be no stderr output for -a
ls -Z e | grep $ctx || fail=1
@@ -52,11 +52,11 @@ mount -oloop,context=$ctx blob mnt || skip=1
test $skip = 1 \
&& skip_ "insufficient mount/ext2 support"
-cd mnt || framework_failure
+cd mnt || framework_failure_
-echo > f || framework_failure
+echo > f || framework_failure_
-echo > g || framework_failure
+echo > g || framework_failure_
# /bin/cp from coreutils-6.7-3.fc7 would fail this test by letting cp
# succeed (giving no diagnostics), yet leaving the destination file empty.
cp -a f g 2>err || fail=1
@@ -85,7 +85,7 @@ grep "Operation not supported" err && fail=1
# NFS mounted directory. When doing that, I get this diagnostic:
# cp: failed to set the security context of `g' to `system_u:object_r:nfs_t': \
# Operation not supported
-cat <<\EOF > exp || framework_failure=1
+cat <<\EOF > exp || framework_failure_
cp: failed to set the security context of
EOF