git: 7a1a6d1e2a83 - main - tests/socket_accf: use require.kmods property instead of ad-hoc checks

[Warner Losh]

The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7a1a6d1e2a836d189447ba725b0e256014613ab8

commit 7a1a6d1e2a836d189447ba725b0e256014613ab8
Author:     Siva Mahadevan <m...@svmhdvn.name>
AuthorDate: 2025-07-21 13:25:26 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2025-09-05 18:42:22 +0000

    tests/socket_accf: use require.kmods property instead of ad-hoc checks
    
    Signed-off-by: Siva Mahadevan <m...@svmhdvn.name>
    Sponsored by: The FreeBSD Foundation
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1780
---
 tests/sys/kern/socket_accf.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/tests/sys/kern/socket_accf.c b/tests/sys/kern/socket_accf.c
index ae6522397cf7..939ca9495689 100644
--- a/tests/sys/kern/socket_accf.c
+++ b/tests/sys/kern/socket_accf.c
@@ -69,14 +69,8 @@ clientsock(struct sockaddr_in *sin)
 static void
 accfon(int l, struct accept_filter_arg *af)
 {
-
        if (setsockopt(l, SOL_SOCKET, SO_ACCEPTFILTER, af, sizeof(*af)) != 0) {
-               if (errno == ENOENT)
-                       atf_tc_skip("Accept filter %s not loaded in kernel",
-                           af->af_name);
-               else
-                       atf_tc_fail("setsockopt(SO_ACCEPTFILTER): %s",
-                           strerror(errno));
+               atf_tc_fail("setsockopt(SO_ACCEPTFILTER): %s", strerror(errno));
        }
 }
 
@@ -95,7 +89,11 @@ usend(int s, const void *msg, size_t len)
        return (rv);
 }
 
-ATF_TC_WITHOUT_HEAD(data);
+ATF_TC(data);
+ATF_TC_HEAD(data, tc)
+{
+       atf_tc_set_md_var(tc, "require.kmods", "accf_data");
+}
 ATF_TC_BODY(data, tc)
 {
        struct accept_filter_arg afa = {
@@ -113,7 +111,11 @@ ATF_TC_BODY(data, tc)
        ATF_REQUIRE((a = accept(l, NULL, 0)) > 0);
 }
 
-ATF_TC_WITHOUT_HEAD(http);
+ATF_TC(http);
+ATF_TC_HEAD(http, tc)
+{
+       atf_tc_set_md_var(tc, "require.kmods", "accf_http");
+}
 ATF_TC_BODY(http, tc)
 {
        struct accept_filter_arg afa = {
@@ -152,7 +154,11 @@ ATF_TC_BODY(http, tc)
        ATF_REQUIRE((a = accept(l, NULL, 0)) > 0);
 }
 
-ATF_TC_WITHOUT_HEAD(tls);
+ATF_TC(tls);
+ATF_TC_HEAD(tls, tc)
+{
+       atf_tc_set_md_var(tc, "require.kmods", "accf_tls");
+}
 ATF_TC_BODY(tls, tc)
 {
        struct accept_filter_arg afa = {
@@ -210,7 +216,11 @@ ATF_TC_BODY(tls, tc)
 }
 
 /* Check changing to a different filter. */
-ATF_TC_WITHOUT_HEAD(change);
+ATF_TC(change);
+ATF_TC_HEAD(change, tc)
+{
+       atf_tc_set_md_var(tc, "require.kmods", "accf_data accf_http");
+}
 ATF_TC_BODY(change, tc)
 {
        struct accept_filter_arg dfa = {