From nobody Wed Jul 9 15:40:32 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 4bchy93cyKz60Ztr; Wed, 09 Jul 2025 15:40:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bchy85KZdz3ZfT; Wed, 09 Jul 2025 15:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752075632; 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=G6UeIaq0PuqGPoLiNnYNhrtrckgLAjFNwm6RrIhmExg=; b=NalxTuBWn6vS24sfZwBS/9brYOLqXFmTQL7Q10Dr7ZAQlX/J2XlcMwwdouiagvXg1QVR+9 j+FZj2gSCW8y0kbyHaRU/O6KIduzyDYIB8PsPHo8KlslisFY1LY84bcMLWuHDVAOtgr3Ef iBuspTbpwAZJJ5jqndB/5fqPtTUHt/MqE005FTKbHh/jgxlMcdOjvbCyLeo+QOJmhpt+0k Rvdcin/L8q+jLYfRk3OYviKAJsEygfZnFlH49yP+54D8kCXyq3Lqr9ZxsYK40Ig78Rq1At B4oVRUun+F2ZhIzeLgSiCIsaMjnuowow41h3W/umzBg8zys/6nJQl8smn8OlGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752075632; 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=G6UeIaq0PuqGPoLiNnYNhrtrckgLAjFNwm6RrIhmExg=; b=F2wwSepRNfI9h50rkN4kr0BY3YV/XIDmVj4pnMxlPBvloEENJ66lZ+4YCuQwhVQCLkuSte QN7Dl07IIi/3GIGSzHLY2MNRUjPB+cpnBXeSHZFslAzi+/BZzc5k8RZjvP8vC+viFHssal xHk/qy6CNR7r4nLpsG6YlfvBHCLjNfq1/ZiM/mrvtimjUfz0YTG8Y4ygOSuBPUCq5u8wdP 8jdFQj4xL6KdeT2hN/dEPApIaJcnGV8Um3gBgOWTl7c70jgnEKVg2YhA6YKcqBc6bLLl54 0ShrlmvHv8/5HYTJFygkkL55+ldgRvWaFgqiVNI7umSLMZsTOPWdN9bSfVE5Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752075632; a=rsa-sha256; cv=none; b=w7/5xQ4mOG5Ja8sW8bivfIBujD6/i2WdwW3qQ+TcWnQq87dymIz3Ue9XPJ9VqxerASKfa4 mxK2ll4483FlIvbZxwE+97QpIQBpLMNsqWXgAzD86Eb8ABxYexeFoTAML07nR+ZwgpML5F y9vSraIkX1+L9LTxJ/MLONtQ3INbcD+dVNT1YkVaBZTbDJwyLq6WySgPAWcVDPYc7RdcVX zaxdwWffCj1M9Qgus3NSFDhBLaDY3XgS1AU0EgVYmd0g1oNCw8w2vkVKFGxp4u4V3oZ1jJ t1jQHR3wmHh59ai1ntE5hYM2qeW5DTXcQsBZJV4LdKh2cPOVe1bzbP2kkam3jQ== 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 4bchy83SSqzCGn; Wed, 09 Jul 2025 15:40:32 +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 569FeWfK008666; Wed, 9 Jul 2025 15:40:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569FeWtQ008663; Wed, 9 Jul 2025 15:40:32 GMT (envelope-from git) Date: Wed, 9 Jul 2025 15:40:32 GMT Message-Id: <202507091540.569FeWtQ008663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 68fe0d9cc03b - main - pfctl tests: use require.kmods instead of manual check for pf 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68fe0d9cc03bd80f63a5317a633d2426ae286316 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=68fe0d9cc03bd80f63a5317a633d2426ae286316 commit 68fe0d9cc03bd80f63a5317a633d2426ae286316 Author: Siva Mahadevan AuthorDate: 2025-07-08 15:14:48 +0000 Commit: Kristof Provost CommitDate: 2025-07-09 15:38:09 +0000 pfctl tests: use require.kmods instead of manual check for pf Reviewed by: kp Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1762 --- sbin/pfctl/tests/pfctl_test.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/sbin/pfctl/tests/pfctl_test.c b/sbin/pfctl/tests/pfctl_test.c index dbdcaa4900ea..5f0aa7826bb4 100644 --- a/sbin/pfctl/tests/pfctl_test.c +++ b/sbin/pfctl/tests/pfctl_test.c @@ -65,24 +65,6 @@ * Copied from OpenBSD. */ -static bool -check_pf_module_available(void) -{ - int modid; - struct module_stat stat; - - if ((modid = modfind("pf")) < 0) { - warn("pf module not found"); - return false; - } - stat.version = sizeof(struct module_stat); - if (modstat(modid, &stat) < 0) { - warn("can't stat pf module id %d", modid); - return false; - } - return (true); -} - extern char **environ; static struct sbuf * @@ -185,9 +167,6 @@ run_pfctl_test(const char *input_path, const char *output_path, struct sbuf *expected_output; struct sbuf *real_output; - if (!check_pf_module_available()) - atf_tc_skip("pf(4) is not loaded"); - /* The test inputs need to be able to use relative includes. */ snprintf(input_files_path, sizeof(input_files_path), "%s/files", atf_tc_get_config_var(tc, "srcdir")); @@ -292,6 +271,7 @@ do_selfpf_test(const char *number, const atf_tc_t *tc) ATF_TC_HEAD(pf##number, tc) \ { \ atf_tc_set_md_var(tc, "descr", descr); \ + atf_tc_set_md_var(tc, "require.kmods", "pf"); \ } \ ATF_TC_BODY(pf##number, tc) \ { \ @@ -301,6 +281,7 @@ do_selfpf_test(const char *number, const atf_tc_t *tc) ATF_TC_HEAD(selfpf##number, tc) \ { \ atf_tc_set_md_var(tc, "descr", "Self " descr); \ + atf_tc_set_md_var(tc, "require.kmods", "pf"); \ } \ ATF_TC_BODY(selfpf##number, tc) \ { \ @@ -312,6 +293,7 @@ do_selfpf_test(const char *number, const atf_tc_t *tc) ATF_TC_HEAD(pf##number, tc) \ { \ atf_tc_set_md_var(tc, "descr", descr); \ + atf_tc_set_md_var(tc, "require.kmods", "pf"); \ } \ ATF_TC_BODY(pf##number, tc) \ { \ @@ -325,6 +307,7 @@ do_selfpf_test(const char *number, const atf_tc_t *tc) atf_tc_set_md_var(tc, "descr", descr); \ atf_tc_set_md_var(tc, "execenv", "jail"); \ atf_tc_set_md_var(tc, "execenv.jail.params", "vnet"); \ + atf_tc_set_md_var(tc, "require.kmods", "pf"); \ } \ ATF_TC_BODY(pf##number, tc) \ { \