From nobody Mon Feb 9 18:04:24 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 4f8syx1bbrz6RnNl for ; Mon, 09 Feb 2026 18:04:25 +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 4f8syw75HTz3thP for ; Mon, 09 Feb 2026 18:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770660265; 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=FNpWY9ypaFD+6x4uoCNCvPx0MH70jZ1VZfyr8Es6l7g=; b=X0OqDGYXw1fnlm1ywOqNTvuYR93YOGGeGxyagFyfsu7V2/9s0rdo7HNc64egRYwxncb1Wk hTMTDArI9/s/qX2A6HcQXU3lkyjnzEx6NpK6V5mN0urqfCKDT0MB/ttFeHQ59udI0WtTW/ Ab+pfv/aCGKUYwa3vJPHUbd2lEyXyFMWCfmRwOPONyo+aBxDdhPTen3f2jX7f6u0XeYQ2T Me8hbkPfBk2HZc1wB369pGHCKjA/CbImLjF8XqUlsWtNth2bRg7GncoQUwDK7s94sBnMJu ALI5LmAjsl2AfzIG4Ff7ii16+AQMZ11N8gslpvqrXGiaHBzD6nbB16+H1uSQAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770660265; a=rsa-sha256; cv=none; b=oYvBEjmV1SrASFxft13ilvXxIXjSNwiHiDSBnnjOTUA6UkaYCaLD/E9Hf2ym0trEd+On0t h2OLrz/qLDjJz/B4QPRgrQb8PyVO2+NACnuEOggIK2cxnDkMUXmp0+pMNT2tXNOawuCwsb MirsG6Tkj970id+jY61JwIRdRu5V1++Kqxz6LBkDMckU5PzwHzaDpEQTo5UZTIlWYoi4f0 e2F8YtRa/32s25X2qtY24eYoGIiOTn/CnLRCXo8k3O7Xuf/CAnzWrfsUWdiIC+1opPRYpI WSp+1Uje0PKch0dSAQATmo/okxVjQAQX4LkOdYo5dbHwluh6n6muJ6oI2AmdYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770660265; 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=FNpWY9ypaFD+6x4uoCNCvPx0MH70jZ1VZfyr8Es6l7g=; b=CPnZPb9oR2pJz241mvbUDMN9OmwxJd0P1hGtMeM3zo4lBRRA+8N44WH1n7CH1jsBH64Vsv JJp/JryPiooGDywl8fDuFLL+4ENqee7F8NyAQF2y/iishzI6B+TldvmoaVEprS1D6aGS3L jXNzX+xX5kAD2nqMwXNTrPfrVdS0Tgn36tBjk0c1ZuljTKUE5UqWSp7rEVMjXoPTqNeNH6 msqp8rLKzDnNwGkAOLxqA7SXLxohR0TF272/a0g88y2K4kMs/A2otx2E8rUByla0r60RY4 kF/Ltatov89mAb0vmVXTh/v2AdXP4hnM66bgYQ0jyGeMgys0pNB2ycpJBF7lhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8syw6VGbzkBq for ; Mon, 09 Feb 2026 18:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25d66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 18:04:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c8dad6820630 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c8dad682063018fdf23f3413694d701993d61389 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 18:04:24 +0000 Message-Id: <698a21a8.25d66.6c529ee1@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c8dad682063018fdf23f3413694d701993d61389 commit c8dad682063018fdf23f3413694d701993d61389 Author: Mark Johnston AuthorDate: 2026-01-26 17:24:25 +0000 Commit: Mark Johnston CommitDate: 2026-02-09 18:03:43 +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 (cherry picked from commit 8934c3dc780d6631cb23e4d98c7b988da9a5b703) --- 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)