From nobody Fri Sep 5 18:42:34 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 4cJQFR2Y3Gz66Ddg; Fri, 05 Sep 2025 18:42:35 +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 4cJQFR0QdRz4PN0; Fri, 05 Sep 2025 18:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097755; 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=xwUF1K2kCDd6gyqCJ7O4m7pKt5ZcC0fh2gr4Grzt/XI=; b=vGKzhNS5icZccz9SJZ0Awxd2bEqiHYFiyTnTl+TqbdmVvx/qzTuBlNqJ4Lrqv2ohmutDFL dajgqXskPREgGcVVIVL0QuCVx73xs81CrEC3sZ0xXVsV7IBsoOy4bAGn1vyLRMTptBgVIF oapxb7o5ffTwtne/FSTod3m2HhvKki2Vsa0DptFYV7UXczXURhKt1MsUSWbEUa0FrRxf8u kSBxb8FAvNYTI8HfxRvBjjMd8H91spve8WJzuVouiTQ8lodjEYe/7+1UjbTbGudR0AaXds JSUwIHXqg4fRps7zeok7r+cnZ4gspJWofQS6B97LYujjnAc1CSf02fnsG0eUJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097755; 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=xwUF1K2kCDd6gyqCJ7O4m7pKt5ZcC0fh2gr4Grzt/XI=; b=PgXzf0lAEBuOzraNIH4ODR7lXajAIO9eBSUpkGbr3hEWx5QE20GnlqbgoKof2ohZaB63Z+ rS7cC9+vd6xsx3lQ23+DI6QLqEqypTlZQAjL59PLF03kt58wLK4ZOI/op1mTk6kI5vZXiv dZMbodJKqxIhSrBRYdEMetQ86+iJoYr0gGardDQkF9lSRgaKrlZz8+fsfDDrwFfoUVpuh4 mtdDV+6Qv5AQvTIXzGZcbi7c8R89yvtUjdaH7sFzSE7YQ0cnJQR3hKqr/qxGBqVIdn3gpV FXdn4ves1MyotYsqcuaZTGBitKk2SjWHk756GLeLIB9bDnrBuZ9e4vkBxRLCxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097755; a=rsa-sha256; cv=none; b=pd9DEMLeitE8km4SqlHUCTdkgHtSwN02dU4BdxyajHFJ4TMxHk5MGG2lKUUscZWCe6D/9D 8ps5CQbtcJ10XYBLZ3M12Idi+PNk3YaSmDm9oElNWgGpvAg6y5QGCdgObhMVBzvNgM3Zvu ounF3r+sH7ofFNesrbw9aVpYVvvHmVB77BL6qHp7sncrWOh1Zmas9pkeccTrJUVEERqEAc us6DYMeRwl8bdbF8OPc/iqguuItCdhUtFb6SkRtNvDuuVHnTBO95uiz0cNaXfh9sntcTDo FgQ6wBDqe4NaUShxU1N+m4Kbuu2ybntaMSgkL4Ms3ooBVmiyyx4CSTJLSKE4uw== 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 4cJQFQ6fd6z110g; Fri, 05 Sep 2025 18:42:34 +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 585IgYaT096748; Fri, 5 Sep 2025 18:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IgYG3096745; Fri, 5 Sep 2025 18:42:34 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:42:34 GMT Message-Id: <202509051842.585IgYG3096745@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: 427be10491e3 - main - tests/sys/netinet: 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: 427be10491e37160a82eef31622676c655a29f1e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=427be10491e37160a82eef31622676c655a29f1e commit 427be10491e37160a82eef31622676c655a29f1e Author: Siva Mahadevan AuthorDate: 2025-07-21 13:25:26 +0000 Commit: Warner Losh CommitDate: 2025-09-05 18:42:23 +0000 tests/sys/netinet: 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/netinet/divert.sh | 11 ++--------- tests/sys/netinet/tcp_md5_getsockopt.c | 5 ++--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/sys/netinet/divert.sh b/tests/sys/netinet/divert.sh index d50620d94a09..f521038ba687 100755 --- a/tests/sys/netinet/divert.sh +++ b/tests/sys/netinet/divert.sh @@ -29,19 +29,13 @@ . $(atf_get_srcdir)/../common/vnet.subr -load_divert_module() { - kldstat -q -m ipdivert - if [ $? -ne 0 ]; then - atf_skip "ipdivert module is not loaded" - fi -} - atf_test_case "ipdivert_ip_output_remote_success" "cleanup" ipdivert_ip_output_remote_success_head() { atf_set descr 'Test diverting IPv4 packet to remote destination' atf_set require.user root atf_set require.progs python3 scapy + atf_set require.kmods ipdivert } ipdivert_ip_output_remote_success_body() { @@ -62,7 +56,6 @@ ipdivert_ip_output_remote_success_body() { fi vnet_init - load_divert_module ip4a="192.0.2.5" ip4b="192.0.2.6" @@ -97,6 +90,7 @@ ipdivert_ip_input_local_success_head() { atf_set descr 'Test diverting IPv4 packet to remote destination' atf_set require.user root atf_set require.progs python3 scapy + atf_set require.kmods ipdivert } ipdivert_ip_input_local_success_body() { @@ -117,7 +111,6 @@ ipdivert_ip_input_local_success_body() { fi vnet_init - load_divert_module ip4a="192.0.2.5" ip4b="192.0.2.6" diff --git a/tests/sys/netinet/tcp_md5_getsockopt.c b/tests/sys/netinet/tcp_md5_getsockopt.c index deaa4170caea..e23cfa67185a 100644 --- a/tests/sys/netinet/tcp_md5_getsockopt.c +++ b/tests/sys/netinet/tcp_md5_getsockopt.c @@ -45,9 +45,6 @@ void test_tcp_md5_getsockopt(int); void test_tcp_md5_getsockopt(int v6) { - if (kldfind("tcpmd5.ko") == -1) - atf_tc_skip("Test requires the tcpmd5 kernel module to be loaded"); - struct sockaddr_in *s; struct sockaddr_in6 s6 = { 0 }; struct sockaddr_in s4 = { 0 }; @@ -108,6 +105,7 @@ ATF_TC(tcp_md5_getsockopt_v4); ATF_TC_HEAD(tcp_md5_getsockopt_v4, tc) { atf_tc_set_md_var(tc, "descr", "Test getsockopt for TCP MD5 SIG (IPv4)"); + atf_tc_set_md_var(tc, "require.kmods", "tcpmd5"); } ATF_TC_BODY(tcp_md5_getsockopt_v4, tc) @@ -119,6 +117,7 @@ ATF_TC(tcp_md5_getsockopt_v6); ATF_TC_HEAD(tcp_md5_getsockopt_v6, tc) { atf_tc_set_md_var(tc, "descr", "Test getsockopt for TCP MD5 SIG (IPv6)"); + atf_tc_set_md_var(tc, "require.kmods", "tcpmd5"); } ATF_TC_BODY(tcp_md5_getsockopt_v6, tc)