diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-05-05 15:17:42 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-05-06 08:21:30 +0200 |
| commit | d3dc29c0bef01d16918dfb3b792ef6ed674f7eb9 (patch) | |
| tree | 2e1dc9c8ae1083cccdc2e11b00c2c41a96a105bc /tests/misc/chcon | |
| parent | 6ec3a4f03356a79a49f03e4b8c4d59bca30ca671 (diff) | |
| download | coreutils-d3dc29c0bef01d16918dfb3b792ef6ed674f7eb9.tar.xz | |
tests: skip another test if mcstransd is running
* tests/test-lib.sh (skip_if_mcstransd_is_running_): New function,
extracted from...
* tests/misc/chcon: ...here. Use function, not open-coded test.
* tests/misc/selinux: Use the function here, too.
Require root, not non-root.
* tests/Makefile.am (root_tests): Add misc/selinux.
Diffstat (limited to 'tests/misc/chcon')
| -rwxr-xr-x | tests/misc/chcon | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/misc/chcon b/tests/misc/chcon index e637893ef..d7a9c5f31 100755 --- a/tests/misc/chcon +++ b/tests/misc/chcon @@ -9,16 +9,7 @@ fi . $top_srcdir/tests/test-lib.sh require_root_ require_selinux_ - -# When mcstransd is running, you'll see only the 3-component -# version of file-system context strings. Detect that, -# and if it's running, skip this test. -ctx=$(stat --printf='%C\n' .) || framework_failure -case $ctx in - *:*:*:*) ;; # four components is ok - *) # anything else probably means mcstransd is running - skip_test_ "unexpected context '$ctx'; turn off mcstransd" ;; -esac +skip_if_mcstransd_is_running_ mkdir -p d/sub/s2 || framework_failure touch f g d/sub/1 d/sub/2 || framework_failure |