From nobody Mon Jan 26 17:24:55 2026 X-Original-To: dev-commits-src-all@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 4f0Flr2ZRPz6PKg0 for ; Mon, 26 Jan 2026 17:24:56 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0Flq5QbHz3Ps0 for ; Mon, 26 Jan 2026 17:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769448295; 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=vWNrNyiqXydke0kHG7rcGqRPNW3LJvcO+kjY2avxsmM=; b=pxCH9tuZgQjndnYSH/VKlZnvb3ZAkT5eyV/1H4P8MQmyk4RmsT0cEjeCP3g4oA8WU1fQSH UIQ6EjuSDxYZXGMJPiD2gO+gWC6wdwd3SLiOK3s/4/WJz851B1gfTf4XYdPJAAejTkLVRz 4R2+tw2cFtmL8DUcHvAU48V5p/yaJuru2RHowRhlW2BGk3HikkK3yiJ9sDV9xtDrgwzBuN i9L1A/mw1JsZNiMxgyCo9nXZd73S6VC6gzng0rfn/kA+kpKC4yHUtDcsu5wLucVcnl3Z02 jjVOfPsn3bVLDCl5ky8Wnp2iSX4qpcK8xPFnoUQCk51QfJj47y018jNLt9+0Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769448295; 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=vWNrNyiqXydke0kHG7rcGqRPNW3LJvcO+kjY2avxsmM=; b=Pdez1bAOnqIjWJ3eZAPUrj9fZT3H32LJeZn+k3elsB9hVE5TmAn39230Tkio3/nvDMQzai XSLci6UKwrVU03D4MVa3nqF2VezQrOXj4VvzN7GLCzLjvKUkF6sw12pbZUE2Qvgcqe6DPQ zfGkk3gqlmJbuoe/8Cr0j9U/9cf2bRnUW1d6WiL4ZM6/xcncnUgvixOQAfomBP4QI0F7mw QoY8aGRdUivARSiJZn7RMAGK3JNFMu4cRRbkytxADDQX+AFkvOcf5z92YGzC9Vny9mcLid xbA5OYr7s1eNaRektfSQcj+TIbet93lNQvq9xxSG9OLI04gRJL1PY1QzANRXoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769448295; a=rsa-sha256; cv=none; b=RGLH94kYuHothHUqaVBEMjbEPdqnWy1r5icoV4YzKEnXK8YBwVFtf7DjUSaqcJ5kDMfntP bRc3jZuR0COfI0qw2eE07dIXOfsBRf+qu7BDxhcQnDxlN9hmwtUOXcX8qBaLShZHdXv2Zr AZ5pOVcP9DxPATH/lb01DFN+QElCaOUzzuVGnnPN5WPtuwwA9M4P318rKdQAILTq6ZCxam szKd+ZKE9ggMbMsmAVwSdx1NMKPPlgaNRsw0uRDN/rSWyaR5E+UmgIIHK6O/qXjk23sG/Y npfulDgtYKI8VVM2nwOMV99H810gMIHMUNHCYefdZDbBhnSliaOYUkBjBA3O8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0Flq51hqzVVf for ; Mon, 26 Jan 2026 17:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42612 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 17:24:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8934c3dc780d - main - pf tests: Set require.kmods in divert-to tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8934c3dc780d6631cb23e4d98c7b988da9a5b703 Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 17:24:55 +0000 Message-Id: <6977a367.42612.3f6e490c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8934c3dc780d6631cb23e4d98c7b988da9a5b703 commit 8934c3dc780d6631cb23e4d98c7b988da9a5b703 Author: Mark Johnston AuthorDate: 2026-01-26 17:24:25 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 17:24:25 +0000 pf tests: Set require.kmods in divert-to tests Tests should declare their dependencies rather than testing for them at runtime. Reviewed by: igoro, kp, glebius MFC after: 2 weeks Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54846 --- tests/sys/netpfil/pf/divert-to.sh | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh index 3028c9e75afd..2e0f6920db27 100644 --- a/tests/sys/netpfil/pf/divert-to.sh +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -60,30 +60,16 @@ . $(atf_get_srcdir)/utils.subr -divert_init() -{ - if ! kldstat -q -m ipdivert; then - atf_skip "This test requires ipdivert" - fi -} - -dummynet_init() -{ - if ! kldstat -q -m dummynet; then - atf_skip "This test requires dummynet" - fi -} - atf_test_case "in_div" "cleanup" in_div_head() { atf_set descr 'Test inbound > diverted | divapp terminated' atf_set require.user root + atf_set require.kmods ipdivert } in_div_body() { pft_init - divert_init epair=$(vnet_mkepair) vnet_mkjail div ${epair}b @@ -118,11 +104,11 @@ in_div_in_head() { atf_set descr 'Test inbound > diverted > inbound | host terminated' atf_set require.user root + atf_set require.kmods ipdivert } in_div_in_body() { pft_init - divert_init epair=$(vnet_mkepair) vnet_mkjail div ${epair}b @@ -157,11 +143,11 @@ out_div_head() { atf_set descr 'Test outbound > diverted | divapp terminated' atf_set require.user root + atf_set require.kmods ipdivert } out_div_body() { pft_init - divert_init epair=$(vnet_mkepair) vnet_mkjail div ${epair}b @@ -197,11 +183,11 @@ out_div_out_head() { atf_set descr 'Test outbound > diverted > outbound | network terminated' atf_set require.user root + atf_set require.kmods ipdivert } out_div_out_body() { pft_init - divert_init epair=$(vnet_mkepair) vnet_mkjail div ${epair}b @@ -237,11 +223,11 @@ in_div_in_fwd_out_div_out_head() { atf_set descr 'Test inbound > diverted > inbound > forwarded > outbound > diverted > outbound | network terminated' atf_set require.user root + atf_set require.kmods ipdivert } in_div_in_fwd_out_div_out_body() { pft_init - divert_init # host router site epair0=$(vnet_mkepair) @@ -293,12 +279,11 @@ in_dn_in_div_in_out_div_out_dn_out_head() { atf_set descr 'Test inbound > delayed+diverted > outbound > diverted+delayed > outbound | network terminated' atf_set require.user root + atf_set require.kmods dummynet ipdivert } in_dn_in_div_in_out_div_out_dn_out_body() { pft_init - divert_init - dummynet_init epair=$(vnet_mkepair) vnet_mkjail alcatraz ${epair}b @@ -377,12 +362,12 @@ pr260867_head() { atf_set descr 'Test for the loop reported in PR260867' atf_set require.user root + atf_set require.kmods ipdivert } pr260867_body() { pft_init - divert_init epair=$(vnet_mkepair) @@ -417,12 +402,12 @@ pr260867_icmp_head() { atf_set descr 'Variant of the PR260867 test' atf_set require.user root + atf_set require.kmods ipdivert } pr260867_icmp_body() { pft_init - divert_init epair=$(vnet_mkepair)