The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2a08ae16555ea60c5a1d6f1c9966ea233af405be
commit 2a08ae16555ea60c5a1d6f1c9966ea233af405be Author: Alan Somers <asom...@freebsd.org> AuthorDate: 2025-07-22 23:08:27 +0000 Commit: Alan Somers <asom...@freebsd.org> CommitDate: 2025-07-23 16:26:09 +0000 mac_bsdextended: report that all tests require the kernel module Use the standard required_kmods reporting mechanism to notify Kyua of which kernel modules are required. MFC after: 2 weeks Sponsored by: ConnectWise Reviewed by: Siva Mahadevan <m...@svmhdvn.name> Pull Request: https://github.com/freebsd/freebsd-src/pull/1783 --- tests/sys/mac/bsdextended/Makefile | 1 + tests/sys/mac/bsdextended/matches_test.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/sys/mac/bsdextended/Makefile b/tests/sys/mac/bsdextended/Makefile index 69cd27c0e321..cc3a3f8ea534 100644 --- a/tests/sys/mac/bsdextended/Makefile +++ b/tests/sys/mac/bsdextended/Makefile @@ -9,5 +9,6 @@ TEST_METADATA.ugidfw_test+= required_user="root" # Each test case of matches_test reuses the same ruleset number, so they cannot # be run simultaneously TEST_METADATA.matches_test+= is_exclusive=true +TEST_METADATA+= required_kmods="mac_bsdextended" .include <bsd.test.mk> diff --git a/tests/sys/mac/bsdextended/matches_test.sh b/tests/sys/mac/bsdextended/matches_test.sh index 2a28be0f231b..41fa04f221e3 100644 --- a/tests/sys/mac/bsdextended/matches_test.sh +++ b/tests/sys/mac/bsdextended/matches_test.sh @@ -12,9 +12,6 @@ gidoutrange="daemon" # We expect $uidinrange in this group check_ko() { - if ! sysctl -N security.mac.bsdextended >/dev/null 2>&1; then - atf_skip "mac_bsdextended(4) support isn't available" - fi if [ $(sysctl -n security.mac.bsdextended.enabled) = "0" ]; then # The kernel module is loaded but disabled. Enable it for the # duration of the test.