From d85b0bfed91c8d4ddfae36e2dbfc90cc0b775eff Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Mon, 29 Mar 2021 10:44:55 +0200 Subject: [PATCH] kernel/selinux-testsuite: Bump upstream commit ...to pull in two fixes for the userfaultfd test so it builds sucessfully on RHEL-7 and remove the associated workaround from the wrapper. Signed-off-by: Ondrej Mosnacek --- kernel/selinux-testsuite/runtest.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh index 51dbadc..75fefce 100755 --- a/kernel/selinux-testsuite/runtest.sh +++ b/kernel/selinux-testsuite/runtest.sh @@ -35,7 +35,7 @@ PACKAGE="selinux-policy" # This should be updated as needed after verifying that the new version # doesn't break testing and after applying all necessary tweaks in the TC. # Run with GIT_BRANCH=master to run the latest upstream version. -DEFAULT_COMMIT="9ef6c43a3ffa810c9a0061eb4625980dd178f60a" +DEFAULT_COMMIT="1defa850ae71bc27c9dd101d19f543a42abc9537" # Default pull requests to merge before running the test. # If non-empty, then after checking out GIT_BRANCH the listed upstream pull # requests (by number) are merged, creating a new temporary local branch. @@ -375,11 +375,6 @@ rlJournalStart rlRun "sed -i 's/SCTP_SEND_FAILED_EVENT/SCTP_STREAM_CHANGE_EVENT + 1/g' tests/sctp/*.c" 0 \ "Fix SCTP test compilation on old RHEL kernels" fi - if kver_lt 5.12; then - # __NR_userfaultfd not defined in s390x headers on RHEL-7 - # For now just disable it on kernels without the feature. - exclude_tests+=" userfaultfd" - fi # CONFIG_KEYS_DH_COMPUTE not enabled on RHEL-8 :( exclude_tests+=" keys"