From: Jim Meyering <jim@meyering.net>
Date: Wed, 3 Oct 2007 10:56:32 +0000 (+0200)
Subject: * tests/misc/selinux: Skip this test if the initial chcon fails.
X-Git-Tag: v6.9.89~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cf961f0eaf78faf662d4c751739b0619a5e8d26;p=thirdparty%2Fcoreutils.git

* tests/misc/selinux: Skip this test if the initial chcon fails.
---

diff --git a/ChangeLog b/ChangeLog
index afc67cb673..8dab21800e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-03  Jim Meyering  <jim@meyering.net>
+
+	* tests/misc/selinux: Skip this test if the initial chcon fails.
+
 2007-10-02  Jim Meyering  <jim@meyering.net>
 
 	Never copy through a symlink that cp has just created.
diff --git a/tests/misc/selinux b/tests/misc/selinux
index a4fc78ac47..67de51ea32 100755
--- a/tests/misc/selinux
+++ b/tests/misc/selinux
@@ -25,7 +25,11 @@ fail=0
 ctx=root:object_r:tmp_t
 # FIXME, what if $ctx is no different from the default.  Not likely.
 # give each a different context, via chcon
-chcon $ctx f d p || fail=1
+chcon $ctx f d p 2>/dev/null || {
+  echo 1>&2 'skipping this test: "chcon '$ctx' ..." failed'
+  (exit 77); exit 77
+}
+
 # inspect that context with both ls -Z and stat.
 for i in d f p; do
   c=`ls -dogZ $i|cut -d' ' -f3`; test x$c = x$ctx || fail=1