[tests/selinux] pr775-checkpolicy-revdeps: selinux-testsuite: use correct selinuxfs mount

[tests/selinux] pr775-checkpolicy-revdeps: selinux-testsuite: use correct selinuxfs mount

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 905952c0a5264cd0cc78bf1e3107bb23254c245a
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2019-12-13T10:27:47+01:00
            Stats  : +12/-4 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/905952c0a5264cd0cc78bf1e3107bb23254c245a?branch=pr775-checkpolicy-revdeps

            Log:
            selinux-testsuite: use correct selinuxfs mount

On RHEL-6 selinuxfs is at /selinux instead of /sys/fs/selinux.

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

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index 0836769..c4a4618 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -58,6 +58,9 @@ if [ -z "$GIT_BRANCH" ]; then
     GIT_PATCHES="${GIT_PATCHES:-"$DEFAULT_PATCHES"}"
 fi
 
+# DISTRO unset needed for policy devel Makefile... (Beaker sets it to "RHEL-...")
+TS_ENV="env -u ARCH -u DISTRO LANG=C"
+
 # Check if pipefail is enabled to restore original setting.
 # See: https://unix.stackexchange.com/a/73180
 if false | true; then
@@ -201,6 +204,12 @@ rlJournalStart
             rlRun "! version_le 4.10.0 4.10"
         fi
 
+        if [ -d /sys/fs/selinux ]; then
+            selinuxfs=/sys/fs/selinux
+        else
+            selinuxfs=/selinux
+        fi
+
         # test turns this boolean off
         rlRun "BACKUP_allow_domain_fd_use=\$(boolGet allow_domain_fd_use)"
         rlRun "BACKUP_domain_can_mmap_files=\$(boolGet domain_can_mmap_files)"
@@ -373,11 +382,10 @@ rlJournalStart
     rlPhaseStartTest
         if [ -d selinux-testsuite ]; then
             rlRun "pushd selinux-testsuite"
-            rlRun "env -u ARCH make" 0
+            rlRun "$TS_ENV make SELINUXFS=$selinuxfs" 0
             rlRun "cat results.log" 0
             $PIPEFAIL_ENABLE
-            # DISTRO= needed for policy devel Makefile... (Beaker sets it to "redhat")
-            rlRun "env -u ARCH -u DISTRO LANG=C unbuffer make -s test 2>&1 | tee -a results.log" 0
+            rlRun "$TS_ENV unbuffer make -s test SELINUXFS=$selinuxfs 2>&1 | tee -a results.log" 0
             $PIPEFAIL_DISABLE
             rlRun "popd"
         else
@@ -396,7 +404,7 @@ rlJournalStart
             rlRun "pushd selinux-testsuite"
             # Submit report to beaker.
             rlFileSubmit "results.log" "selinux-testsuite.results.$(uname -r).txt"
-            rlRun "make -s clean" 0-2
+            rlRun "$TS_ENV make -s clean SELINUXFS=$selinuxfs" 0-2
             rlRun "popd"
         fi
         rlRun "semodule -r test_policy" 0,1