From e4d8da99b101d8c6b064dbd16e66be0dac81854a Mon Sep 17 00:00:00 2001 From: Zdenek Pytela Date: Jul 14 2020 14:54:50 +0000 Subject: Set the systemd-bootchart-and-similar test not to run in RHEL < 8.4 The systemd-bootchart-and-similar test was added to test the fix for the systemd-bootchart service in Fedora 31 and newer. In RHEL, this fix has not been applied yet, so the test is not relevant and needs to be skipped. --- diff --git a/selinux-policy/systemd-bootchart-and-similar/main.fmf b/selinux-policy/systemd-bootchart-and-similar/main.fmf index b0d45b8..4b59e45 100644 --- a/selinux-policy/systemd-bootchart-and-similar/main.fmf +++ b/selinux-policy/systemd-bootchart-and-similar/main.fmf @@ -1,3 +1,2 @@ path: /selinux-policy/systemd-bootchart-and-similar tier: 2 - diff --git a/selinux-policy/systemd-bootchart-and-similar/runtest.sh b/selinux-policy/systemd-bootchart-and-similar/runtest.sh index ab08646..83e7dda 100755 --- a/selinux-policy/systemd-bootchart-and-similar/runtest.sh +++ b/selinux-policy/systemd-bootchart-and-similar/runtest.sh @@ -40,6 +40,12 @@ PROCESS_NAME="systemd-bootchart" PROCESS_CONTEXT="systemd_bootchart_t" rlJournalStart + if ! rlIsFedora && ! rlIsRHEL ">8.3"; then + rlLog "Not applicable to this OS version." + rlJournalEnd + exit 0 + fi + rlPhaseStartSetup rlRun "rlImport 'selinux-policy/common'" rlSESatisfyRequires