From nobody Fri Sep 5 18:42:33 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 4cJQFQ2ypBz66DdY; Fri, 05 Sep 2025 18:42:34 +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 4cJQFP74Lpz4PFH; Fri, 05 Sep 2025 18:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097754; 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=w8IackV4l2XYAI4a9ekFTkPHOGK+YgKIDsNmTFX341o=; b=fot4XIYSeBg+KqEfTStLQsa/OSDLKnipfOqb2Y+bN5zCNFnUdXF+KNQ1tcNOCeNEDWCsRz MLyB/jhW0fROhuVf+gPNHw+60sY7r+Ro3hbQiRHkwtwMwpz25lCGJkyBw8DBDnOL9eAtkm 6ej5Er3EiHcTHjGf4PBmeDENX2v2k4VLj2tbOAiaPEints2TNnnzKZYQYSmeQHfc6lIeoY 5s60ZwONyHhvzUBafb8psX1oSE1BWUuW7f9WPOXrEc+Mk3B/INUg1cHbfazWnjAL79UH3p Laq8hOR6T3SEprOP/EBeCaouSb6mh/TxCx/5H6bpnbna87Sz3fv8a8iIVTN4Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097754; 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=w8IackV4l2XYAI4a9ekFTkPHOGK+YgKIDsNmTFX341o=; b=hpJg4/2qZ5hXU/hFVACeVWK1spLdwbBNGK0jScCe8fY/W7bMiKIMJYsWZV25uxt+UxZHs6 NYlqptY5aiGDJe8UCbTLhealGZvo7EMJIWWQNmnl0y2QU6SGqCGXdevwE5LA9idNNJRcWe N27aRwdfsEVBCX/lpc329rjRK5RhrdX0bdDgvVhxmd2hho0StY9nzJnpdrAlJBWo8QytuJ 7SpyUoxYNTx6qNzmcHm8IOSy5qnpRr65LvIaK8u1ZCki4v6yAczYvzWoOW0ChCaxmjLWjJ U2/zdOq/x6v6PbzsjTITykZRzMuq7OMOFtU3ZxuE7PEAcXbk01vzVLEKR/3s0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097754; a=rsa-sha256; cv=none; b=DPF89/8Qkw1NbiXdIDW278DlMzCsbY9kQBKVYQiOyjMqnn6P1lznzodt90a9yUv9NYj92X Kh8+z++lsK4cMKElrruTE6BsHwzs/MWGk6tebELg7nFs22AnHRj6hgu4nT3M0r45iHsFL7 CImgFTurXqe99u/ipLEC+zbGllvMV9xFoIV+fOEqZwXWvSNLpPS6Dp7+pKHBiW9AYj4a2G /rxNt/M9+GzMs4/Je0sLBYxFqVXIXSUDqHH7V/hkIw1qP/DiN6GUJ4HlsYski0IY87ed30 LXZakqbdccyJvLKrjJHmCJkqqaXHmTlzPQ3fPXLIha2hzDEzG+0N2z0L8zqAZw== 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 4cJQFP6NT3z11Gp; Fri, 05 Sep 2025 18:42:33 +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 585IgXDn096708; Fri, 5 Sep 2025 18:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IgXJF096705; Fri, 5 Sep 2025 18:42:33 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:42:33 GMT Message-Id: <202509051842.585IgXJF096705@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: 4079513328d5 - main - tests/sys/net: 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: 4079513328d5656e31cb853a799176ff2500f79b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4079513328d5656e31cb853a799176ff2500f79b commit 4079513328d5656e31cb853a799176ff2500f79b Author: Siva Mahadevan AuthorDate: 2025-07-21 13:25:26 +0000 Commit: Warner Losh CommitDate: 2025-09-05 18:42:23 +0000 tests/sys/net: 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/net/if_epair.c | 4 +--- tests/sys/net/if_ovpn/if_ovpn_c.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/sys/net/if_epair.c b/tests/sys/net/if_epair.c index 0817b298d427..5ee4a48aea86 100644 --- a/tests/sys/net/if_epair.c +++ b/tests/sys/net/if_epair.c @@ -44,6 +44,7 @@ ATF_TC(params); ATF_TC_HEAD(params, tc) { atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "if_epair"); } ATF_TC_BODY(params, tc) @@ -51,9 +52,6 @@ ATF_TC_BODY(params, tc) struct ifreq ifr; int s; - kldload("if_epair"); - ATF_REQUIRE_KERNEL_MODULE("if_epair"); - s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0) atf_tc_fail("Failed to create socket"); diff --git a/tests/sys/net/if_ovpn/if_ovpn_c.c b/tests/sys/net/if_ovpn/if_ovpn_c.c index fa8a9a07fa35..7b558f1975dd 100644 --- a/tests/sys/net/if_ovpn/if_ovpn_c.c +++ b/tests/sys/net/if_ovpn/if_ovpn_c.c @@ -78,6 +78,7 @@ ATF_TC_WITH_CLEANUP(tcp); ATF_TC_HEAD(tcp, tc) { atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "if_ovpn"); } ATF_TC_BODY(tcp, tc) @@ -87,10 +88,6 @@ ATF_TC_BODY(tcp, tc) int ret; nvlist_t *nvl; - /* Ensure the module is loaded. */ - if (kldfind("if_ovpn") == -1 && errno == ENOENT) - atf_tc_skip("if_ovpn not loaded"); - ovpn_fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); /* Kick off a connect so there's a local address set, which we need for