git: 68fe0d9cc03b - main - pfctl tests: use require.kmods instead of manual check for pf

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=68fe0d9cc03bd80f63a5317a633d2426ae286316

commit 68fe0d9cc03bd80f63a5317a633d2426ae286316
Author:     Siva Mahadevan <me@svmhdvn.name>
AuthorDate: 2025-07-08 15:14:48 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2025-07-09 15:38:09 +0000

    pfctl tests: use require.kmods instead of manual check for pf
    
    Reviewed by:    kp
    Signed-off-by:  Siva Mahadevan <me@svmhdvn.name>
    Sponsored by:   The FreeBSD Foundation
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/1762
---
 sbin/pfctl/tests/pfctl_test.c | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/sbin/pfctl/tests/pfctl_test.c b/sbin/pfctl/tests/pfctl_test.c
index dbdcaa4900ea..5f0aa7826bb4 100644
--- a/sbin/pfctl/tests/pfctl_test.c
+++ b/sbin/pfctl/tests/pfctl_test.c
@@ -65,24 +65,6 @@
  *         Copied from OpenBSD.
  */
 
-static bool
-check_pf_module_available(void)
-{
-	int modid;
-	struct module_stat stat;
-
-	if ((modid = modfind("pf")) < 0) {
-		warn("pf module not found");
-		return false;
-	}
-	stat.version = sizeof(struct module_stat);
-	if (modstat(modid, &stat) < 0) {
-		warn("can't stat pf module id %d", modid);
-		return false;
-	}
-	return (true);
-}
-
 extern char **environ;
 
 static struct sbuf *
@@ -185,9 +167,6 @@ run_pfctl_test(const char *input_path, const char *output_path,
 	struct sbuf *expected_output;
 	struct sbuf *real_output;
 
-	if (!check_pf_module_available())
-		atf_tc_skip("pf(4) is not loaded");
-
 	/* The test inputs need to be able to use relative includes. */
 	snprintf(input_files_path, sizeof(input_files_path), "%s/files",
 	    atf_tc_get_config_var(tc, "srcdir"));
@@ -292,6 +271,7 @@ do_selfpf_test(const char *number, const atf_tc_t *tc)
 	ATF_TC_HEAD(pf##number, tc)				\
 	{							\
 		atf_tc_set_md_var(tc, "descr", descr);		\
+		atf_tc_set_md_var(tc, "require.kmods", "pf");	\
 	}							\
 	ATF_TC_BODY(pf##number, tc)				\
 	{							\
@@ -301,6 +281,7 @@ do_selfpf_test(const char *number, const atf_tc_t *tc)
 	ATF_TC_HEAD(selfpf##number, tc)				\
 	{							\
 		atf_tc_set_md_var(tc, "descr", "Self " descr);	\
+		atf_tc_set_md_var(tc, "require.kmods", "pf");	\
 	}							\
 	ATF_TC_BODY(selfpf##number, tc)				\
 	{							\
@@ -312,6 +293,7 @@ do_selfpf_test(const char *number, const atf_tc_t *tc)
 	ATF_TC_HEAD(pf##number, tc)				\
 	{							\
 		atf_tc_set_md_var(tc, "descr", descr);		\
+		atf_tc_set_md_var(tc, "require.kmods", "pf");	\
 	}							\
 	ATF_TC_BODY(pf##number, tc)				\
 	{							\
@@ -325,6 +307,7 @@ do_selfpf_test(const char *number, const atf_tc_t *tc)
 		atf_tc_set_md_var(tc, "descr", descr);		\
 		atf_tc_set_md_var(tc, "execenv", "jail");	\
 		atf_tc_set_md_var(tc, "execenv.jail.params", "vnet");	\
+		atf_tc_set_md_var(tc, "require.kmods", "pf");	\
 	}							\
 	ATF_TC_BODY(pf##number, tc)				\
 	{							\