From nobody Fri Sep 5 18:42:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cJQFP14Jgz66DGC; Fri, 05 Sep 2025 18:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQFN5NMrz4NwD; Fri, 05 Sep 2025 18:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUz+IdAeOFJkKqXGlt6w4724ybcPguoDiw4UG2rnMqE=; b=qtzRIjWSomh45qWOHcR+fXEHAEtuOyck9NTfOaSzoQpjxNwBRKzb2jfsBNN5O5OjWp7sJm R5AicKT0iiGUwnROeEJc+e6/PmUOhIX4HUgQJUf7om/zFYzjeRey/DE4g9MBAk2C7KvbaB 0YykrVkZ3az9JOD6zhSNxkY1JbbvdDofvvIwxMrCrnx74LIE+NpVy7OJqpPxuRS53UjN4S NUqcoYmhCS/GOsLp30ghIN1trb1JupPY3xAacv4ocn9UatJyL/ObQGmAK8oV6FSgERka1S 6sOAKqp6HheJEmOVD+COcphS10xQ3P32sdPcrNIgK3+82lFSDQPot1J0roPbBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUz+IdAeOFJkKqXGlt6w4724ybcPguoDiw4UG2rnMqE=; b=MguMAo7RY6rSZTA1/95PULruNJw1F4bFU6T81XWA8gWJ6UGAWCP8o35oNzrXFeIycNLZKu ojr5VgnmQnCO+EXgJLmwmrTdiGeLF5ngkcXWZTl9TRhcLXCqbHeSZh3VEctZxG7/02xEFK OPpOFJbSJnmARN3quElKybfX/KrL0ObdXD94qHFCKeVC7+3Zlj/5Pa/wbexdBsJQeKcc/+ vc9C28807lMPcP5/mLty3Nhd8fp2AFXnh9zAKU1jdUTaJSjYXxs9+HxJjwFkh1nn0kjTtD Jn85AWSA8DO1gm4Ulwj3vfNXfcqnKRw9xnMS7IUixNT3Z9+9V5iSLPrthCQt9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097752; a=rsa-sha256; cv=none; b=Bi3NYiY8xVBHzGWmlSfJ8TTEq8rsuIpNYoE8YFdoolXOgNlLjJ3j0+Re5A58HLM8Hm2DQr VuBRzgSVjhjHb7uhLa62syWxFaLRv8YlQnZ8HEGg1rzNK+dPrZDGssT+tKrh9XHZnXuymW LNLsLa8MX64eUQrClXpRq5rBYIyVDe3IYQ6PyDyfHCvYhmMC50W0dJFvGSG6CNRPNAYlfv ni7bvIHQq+FUZaIaQ3pa6bnGyLyTrA6pGa2JDCtPxI+aeGaFwy82gMlZF2F+tUxrTg3VX1 avAgu6vkUWx5D+W4Ov+kIqNUNcJ0FQOzulPuQTBWgLmEww2d0Mznf+HHVl54wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cJQFN4ZLtz11Qb; Fri, 05 Sep 2025 18:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585IgWLf096674; Fri, 5 Sep 2025 18:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IgWHs096671; Fri, 5 Sep 2025 18:42:32 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:42:32 GMT Message-Id: <202509051842.585IgWHs096671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7a1a6d1e2a83 - main - tests/socket_accf: use require.kmods property instead of ad-hoc checks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a1a6d1e2a836d189447ba725b0e256014613ab8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7a1a6d1e2a836d189447ba725b0e256014613ab8 commit 7a1a6d1e2a836d189447ba725b0e256014613ab8 Author: Siva Mahadevan AuthorDate: 2025-07-21 13:25:26 +0000 Commit: Warner Losh 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 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 = {