git: 427be10491e3 - main - tests/sys/netinet: use require.kmods property instead of ad-hoc checks

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=427be10491e37160a82eef31622676c655a29f1e

commit 427be10491e37160a82eef31622676c655a29f1e
Author:     Siva Mahadevan <me@svmhdvn.name>
AuthorDate: 2025-07-21 13:25:26 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-09-05 18:42:23 +0000

    tests/sys/netinet: use require.kmods property instead of ad-hoc checks
    
    Signed-off-by: Siva Mahadevan <me@svmhdvn.name>
    Sponsored by: The FreeBSD Foundation
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1780
---
 tests/sys/netinet/divert.sh            | 11 ++---------
 tests/sys/netinet/tcp_md5_getsockopt.c |  5 ++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/tests/sys/netinet/divert.sh b/tests/sys/netinet/divert.sh
index d50620d94a09..f521038ba687 100755
--- a/tests/sys/netinet/divert.sh
+++ b/tests/sys/netinet/divert.sh
@@ -29,19 +29,13 @@
 
 . $(atf_get_srcdir)/../common/vnet.subr
 
-load_divert_module() {
-	kldstat -q -m ipdivert
-	if [ $? -ne  0 ]; then
-		atf_skip "ipdivert module is not loaded"
-	fi
-}
-
 atf_test_case "ipdivert_ip_output_remote_success" "cleanup"
 ipdivert_ip_output_remote_success_head() {
 
 	atf_set descr 'Test diverting IPv4 packet to remote destination'
 	atf_set require.user root
 	atf_set require.progs python3 scapy
+	atf_set require.kmods ipdivert
 }
 
 ipdivert_ip_output_remote_success_body() {
@@ -62,7 +56,6 @@ ipdivert_ip_output_remote_success_body() {
 	fi
 
 	vnet_init
-	load_divert_module
 
 	ip4a="192.0.2.5"
 	ip4b="192.0.2.6"
@@ -97,6 +90,7 @@ ipdivert_ip_input_local_success_head() {
 	atf_set descr 'Test diverting IPv4 packet to remote destination'
 	atf_set require.user root
 	atf_set require.progs python3 scapy
+	atf_set require.kmods ipdivert
 }
 
 ipdivert_ip_input_local_success_body() {
@@ -117,7 +111,6 @@ ipdivert_ip_input_local_success_body() {
 	fi
 
 	vnet_init
-	load_divert_module
 
 	ip4a="192.0.2.5"
 	ip4b="192.0.2.6"
diff --git a/tests/sys/netinet/tcp_md5_getsockopt.c b/tests/sys/netinet/tcp_md5_getsockopt.c
index deaa4170caea..e23cfa67185a 100644
--- a/tests/sys/netinet/tcp_md5_getsockopt.c
+++ b/tests/sys/netinet/tcp_md5_getsockopt.c
@@ -45,9 +45,6 @@ void test_tcp_md5_getsockopt(int);
 void
 test_tcp_md5_getsockopt(int v6)
 {
-	if (kldfind("tcpmd5.ko") == -1)
-		atf_tc_skip("Test requires the tcpmd5 kernel module to be loaded");
-
         struct sockaddr_in *s;
         struct sockaddr_in6 s6 = { 0 };
         struct sockaddr_in s4 = { 0 };
@@ -108,6 +105,7 @@ ATF_TC(tcp_md5_getsockopt_v4);
 ATF_TC_HEAD(tcp_md5_getsockopt_v4, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Test getsockopt for TCP MD5 SIG (IPv4)");
+	atf_tc_set_md_var(tc, "require.kmods", "tcpmd5");
 }
 
 ATF_TC_BODY(tcp_md5_getsockopt_v4, tc)
@@ -119,6 +117,7 @@ ATF_TC(tcp_md5_getsockopt_v6);
 ATF_TC_HEAD(tcp_md5_getsockopt_v6, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Test getsockopt for TCP MD5 SIG (IPv6)");
+	atf_tc_set_md_var(tc, "require.kmods", "tcpmd5");
 }
 
 ATF_TC_BODY(tcp_md5_getsockopt_v6, tc)