[tests/selinux] pr775-checkpolicy-revdeps: selinux-testsuite: avoid unsafe tweaks

[tests/selinux] pr775-checkpolicy-revdeps: selinux-testsuite: avoid unsafe tweaks

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 097169c779cd79c260433ba5795f511eb852ac9b
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2020-03-11T13:10:22+01:00
            Stats  : +11/-4 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/097169c779cd79c260433ba5795f511eb852ac9b?branch=pr775-checkpolicy-revdeps

            Log:
            selinux-testsuite: avoid unsafe tweaks

Replacing kernel version occurences is problematic when different tests
have the same bounding kernel version, as is true for current upstream.
Therefore, replace it with adding "force_tests" list that works
similarly to the existing "exclude_tests" list, but forces execution of
the tests instead of excluding them.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 9695f67..70dc44a 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -283,15 +283,18 @@ rlJournalStart
                 "Harden tun_tap test against missing defs"
 
             exclude_tests=""
+            force_tests=""
             for file in ./tests/nnp*/execnnp.c; do
                 rlRun "sed -i 's/3.18/3.9/' $file" 0 \
                     "Fix up kernel version in nnp test"
             done
             if rlIsRHEL ; then
-                rlRun "sed -i 's/4.20.17/4.18/' tests/Makefile" 0 \
-                    "Fix up kernel version for sctp test"
-                rlRun "sed -i 's/5.2/4.18.0-80.19/' tests/Makefile" 0 \
-                    "Fix up kernel version for cgroupfs_label test"
+                if kver_ge 4.18; then
+                    force_tests+=" sctp"
+                fi
+                if kver_ge 4.18.0-80.19; then
+                    force_tests+=" cgroupfs_label"
+                fi
                 # CONFIG_KEYS_DH_COMPUTE not enabled on RHEL-8 :(
                 exclude_tests+=" keys"
             fi
@@ -366,6 +369,10 @@ rlJournalStart
                 rlRun "sed -i '/^[^[:space:]]*:\(\| .*\)\$/i SUBDIRS:=\$(filter-out $exclude_tests, \$(SUBDIRS))' tests/Makefile" 0 \
                     "Exclude not applicable tests: $exclude_tests"
             fi
+            if [ -n "$force_tests" ] ; then
+                rlRun "sed -i '/^[^[:space:]]*:\(\| .*\)\$/i SUBDIRS:=\$(filter-out $force_tests, \$(SUBDIRS))\nSUBDIRS += $force_tests' tests/Makefile" 0 \
+                    "Force applicable tests: $force_tests"
+            fi
 
             # needed for filesystem test on RHEL-7
             rlRun "modprobe ext4"