From: Johannes Segitz <jsegitz@suse.de>
Date: Thu, 17 Aug 2023 17:04:53 +0000 (+0200)
Subject: test: Check that SELinux policy is available before running SELinux test (#28868)
X-Git-Tag: v255-rc1~697
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f22d16bb3c3bbb72c2847000e2e10bf1384c0f3;p=thirdparty%2Fsystemd.git

test: Check that SELinux policy is available before running SELinux test (#28868)

* test: Check that SELinux policy is available before running SELinux test

---------

Co-authored-by: Frantisek Sumsal <frantisek@sumsal.cz>
---

diff --git a/test/TEST-06-SELINUX/test.sh b/test/TEST-06-SELINUX/test.sh
index 340c74ef163..0757b38cc29 100755
--- a/test/TEST-06-SELINUX/test.sh
+++ b/test/TEST-06-SELINUX/test.sh
@@ -7,11 +7,16 @@ IMAGE_NAME="selinux"
 TEST_NO_NSPAWN=1
 
 # Requirements:
-# selinux-policy-targeted
+# A selinux policy is installed. Preferably selinux-policy-targeted, but it could work with others
 # selinux-policy-devel
 
-# Check if selinux-policy-devel is installed, and if it isn't bail out early instead of failing
-test -f /usr/share/selinux/devel/include/system/systemd.if || exit 0
+# Check if
+# - selinux-policy-devel is installed and
+# - some selinux policy is installed. To keep this generic just check for the
+#   existence of a directory below /etc/selinux/, indicating a SELinux policy is
+#   installed
+# otherwise bail out early instead of failing
+test -f /usr/share/selinux/devel/include/system/systemd.if && find /etc/selinux -mindepth 1 -maxdepth 1 -not -empty -type d | grep -q . || exit 0
 
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"