From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 5 Jun 2018 19:27:01 +0000 (+0200)
Subject: tests: tighten check for TEST-06-SELINUX dependencies a bit
X-Git-Tag: v239~132^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc4338e435b1d83d7d2cd572e72036d37e12af96;p=thirdparty%2Fsystemd.git

tests: tighten check for TEST-06-SELINUX dependencies a bit

As it turns out /usr/share/selinux/devel/ is now included in more RPMs
than just selinux-policy-devel (specifically container-selinux, which is
pulled in by various container related RPMs). Let's hence tighten the
dependency check a bit and look for systemd's .if file, which is what we
actually care about.
---

diff --git a/test/TEST-06-SELINUX/test.sh b/test/TEST-06-SELINUX/test.sh
index 18856c24594..604ede5b2b9 100755
--- a/test/TEST-06-SELINUX/test.sh
+++ b/test/TEST-06-SELINUX/test.sh
@@ -11,7 +11,7 @@ TEST_NO_NSPAWN=1
 # selinux-policy-devel
 
 # Check if selinux-policy-devel is installed, and if it isn't bail out early instead of failing
-test -d /usr/share/selinux/devel || exit 0
+test -f /usr/share/selinux/devel/include/system/systemd.if || exit 0
 
 . $TEST_BASE_DIR/test-functions
 SETUP_SELINUX=yes