From nobody Fri Sep 5 18:42:30 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 4cJQFL677tz66DVR; Fri, 05 Sep 2025 18:42:30 +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 4cJQFL316pz4Nvv; Fri, 05 Sep 2025 18:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097750; 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=PQyJ3hx3LjOe57lbSnNzsHSiWBj0f6TVaHpCqMBsNeM=; b=OcHb/wjBiYZe7Jq8p1946ktdbwLVIQ5vOJoGNhCmwT0FEcFAtJpwKdnUskIKExAbSTtqXf GaeGFtdNubZdElEUpFBios9uqDAno0RF9Nz4+dNHvkDHGzpXNLzT9ZVmx0/9K2tPj/noJT U0VT1ZRcUw6eyCFhnzmD6XFUHsjY1t7seANGaRc91xYTPLjmjIsdtAx1LOdDJvPwKE++fS DT2ZCtbbcMmlOfqoWMgWPpp6CxAeU3SjlQI88QOhYME2r6/lU82YQjEHlhPUY6YhDalXhd o9obpGwtHU9Ax26YzfHlSEHQz6kNuN9URM8pT1hJkK5tqBGai9MrLB1br44DBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097750; 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=PQyJ3hx3LjOe57lbSnNzsHSiWBj0f6TVaHpCqMBsNeM=; b=lQ+igbGo1YWEUpmSPYC17AHxjLhH04PvXQLJ+7Zktu9YcEU4OPKE6crOfOU4jFd6FcGKSj ytF12CEyx+pMhltEictygdxbHRRLgv0K2YLuHZULYrmk21hMR797qMkVDWdSBKzLYO2WsL O6T8PNDKqWSb14cbRRjcq+fPyxx74/zhiqrLvlp0Sy/n2qAyzu4eZkqYzgYLNge1/LhTbe wZxG8/aRdOFjPEmwRx4mWUGx+zhivWJP9Ky+uuE3H4Q7s9r7MeDQhm5n3gcmq2nri663ir yj/MyEHzos/Lsh9oLzF79aAoRHI8Uora5z1m981BzzwswN2eate82ur6HwiBnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097750; a=rsa-sha256; cv=none; b=wDbmaWGyrb3Z1+J/Xl/saLwPjwrGsX6B/oUw7mNVEn4Ii+9o5eM2uCLqZcQrTfUc8p5h4m DTcqGRO9s4l5YxrBLjRYfFxvsbKv/KZyj+zujBMhzn4eRWDDTSAtQ4uRTAqv6ZaY4WphRR WXDyztkiDZpICuCXfs9Ng543oOW4WKJbaL8mygstuFFlxhYseoBmM9IrjEGAD4i1ZHCtiH o/XQ4mxy1jKoSoX0MoyBkoAnc9QYGbhj4ddF8BuSXpR9Dhr2B1nauxwY0UHSOhHeKdbt6E 6hWCSlyTUsp6Bo/j3+9qAra3ePdUshRxWx7Ni8kvzyL4/zgy1K1euOAkK2W3gg== 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 4cJQFL2Rvmz110f; Fri, 05 Sep 2025 18:42:30 +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 585IgU8w096607; Fri, 5 Sep 2025 18:42:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IgUo8096604; Fri, 5 Sep 2025 18:42:30 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:42:30 GMT Message-Id: <202509051842.585IgUo8096604@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: 559b0f6b8286 - main - tests/sys/netmap: 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: 559b0f6b82867b60a2d5cb1b2744114603cb17a7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=559b0f6b82867b60a2d5cb1b2744114603cb17a7 commit 559b0f6b82867b60a2d5cb1b2744114603cb17a7 Author: Siva Mahadevan AuthorDate: 2025-07-21 13:25:26 +0000 Commit: Warner Losh CommitDate: 2025-09-05 18:42:22 +0000 tests/sys/netmap: 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/netmap/Makefile | 1 + tests/sys/netmap/ctrl-api-test.c | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/sys/netmap/Makefile b/tests/sys/netmap/Makefile index ee00d0421620..bd713ff795bc 100644 --- a/tests/sys/netmap/Makefile +++ b/tests/sys/netmap/Makefile @@ -3,6 +3,7 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netmap TEST_METADATA+= required_user="root" TEST_METADATA+= is_exclusive=true +TEST_METADATA+= required_kmods="if_tap netmap" PLAIN_TESTS_C+= ctrl-api-test diff --git a/tests/sys/netmap/ctrl-api-test.c b/tests/sys/netmap/ctrl-api-test.c index 6b45dbb1cfea..36c131980360 100644 --- a/tests/sys/netmap/ctrl-api-test.c +++ b/tests/sys/netmap/ctrl-api-test.c @@ -59,8 +59,6 @@ #include #ifdef __FreeBSD__ -#include "freebsd_test_suite/macros.h" - static int eventfd(int x __unused, int y __unused) { @@ -2199,11 +2197,6 @@ main(int argc, char **argv) int opt; int i; -#ifdef __FreeBSD__ - PLAIN_REQUIRE_KERNEL_MODULE("if_tap", 0); - PLAIN_REQUIRE_KERNEL_MODULE("netmap", 0); -#endif - memset(&ctx_, 0, sizeof(ctx_)); {