git: 4079513328d5 - main - tests/sys/net: 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=4079513328d5656e31cb853a799176ff2500f79b

commit 4079513328d5656e31cb853a799176ff2500f79b
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/net: 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/net/if_epair.c          | 4 +---
 tests/sys/net/if_ovpn/if_ovpn_c.c | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/sys/net/if_epair.c b/tests/sys/net/if_epair.c
index 0817b298d427..5ee4a48aea86 100644
--- a/tests/sys/net/if_epair.c
+++ b/tests/sys/net/if_epair.c
@@ -44,6 +44,7 @@ ATF_TC(params);
 ATF_TC_HEAD(params, tc)
 {
         atf_tc_set_md_var(tc, "require.user", "root");
+        atf_tc_set_md_var(tc, "require.kmods", "if_epair");
 }
 
 ATF_TC_BODY(params, tc)
@@ -51,9 +52,6 @@ ATF_TC_BODY(params, tc)
 	struct ifreq ifr;
 	int s;
 
-	kldload("if_epair");
-	ATF_REQUIRE_KERNEL_MODULE("if_epair");
-
 	s = socket(AF_INET, SOCK_DGRAM, 0);
 	if (s < 0)
 		atf_tc_fail("Failed to create socket");
diff --git a/tests/sys/net/if_ovpn/if_ovpn_c.c b/tests/sys/net/if_ovpn/if_ovpn_c.c
index fa8a9a07fa35..7b558f1975dd 100644
--- a/tests/sys/net/if_ovpn/if_ovpn_c.c
+++ b/tests/sys/net/if_ovpn/if_ovpn_c.c
@@ -78,6 +78,7 @@ ATF_TC_WITH_CLEANUP(tcp);
 ATF_TC_HEAD(tcp, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
+	atf_tc_set_md_var(tc, "require.kmods", "if_ovpn");
 }
 
 ATF_TC_BODY(tcp, tc)
@@ -87,10 +88,6 @@ ATF_TC_BODY(tcp, tc)
 	int ret;
 	nvlist_t *nvl;
 
-	/* Ensure the module is loaded. */
-	if (kldfind("if_ovpn") == -1 && errno == ENOENT)
-		atf_tc_skip("if_ovpn not loaded");
-
 	ovpn_fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
 
 	/* Kick off a connect so there's a local address set, which we need for