From nobody Tue Jul 28 10:06:33 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 4h8WMY61Qqz6mVWv for ; Tue, 28 Jul 2026 10:06: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8WMY4DYlz3h5w for ; Tue, 28 Jul 2026 10:06:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785233193; 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=Q7Pvoqh93L0rQ6LraJvGV/GCmL3zBxdgm/tlZHD36lU=; b=YYt/rx4qZ/0OxQDiUsmrdXuyXJZ3W0K8M8+kyU9bjWCYUN5BgOmkmj67RwJcYHpa5Bj2WU jyWDcVKavtIDAZa62mksW9R3ATdgvv0RJ95Al2dbCdj3qWXBrXRDXy2UNQO0LfUQrcq9nE nsDd3j24dZyhDKE1Vwn/FvVt9Ej1PMxelHpOPv4g4FMoOgjt/LkdmI/YVnxiA3Fbm3q/aZ eT/q8t00q206j1J/GYCsJKvPlE7BbxtgLX3HQ3B/OoImYK7QXSw/ltgmH1V97VeX3RYzrn 5juHWhKYBVwiC/bmRaWMuUuxY1VL530NXF7mDNgkOTxFF7ktO+/ai5N6Q9HDxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785233193; a=rsa-sha256; cv=none; b=i+/2MaYOx+pOTa2C60H4x+PywWcda2EZmdeQNvgJFcM7Xk/j7t1j9MVKeVCrwpyHMHABuQ e5EJWl0wL6TfydXjjscA9oQoT9ouIwkUDel++ns9wmyBaEsZGrZd0yYvDZzN9LRBXvzk63 DPnIDZ+yxM1QeqmhJHADY0clXDnjvd84XTJdVDFwSPtapiqFW4g8Z+YHa5j9kOwC249GMo 3NaUnlDB7eMbenLv/gNpJYWvXW3uiy/K0VFo7k2zP5EVPjRc58n1GLzFJz0DBvx+M6ntKI HuudKA3Mq+dEBZ6YVWynm5YmUvXW+5AzM8gfdH28Y7OcpnalBw7h9Xur4WNdrQ== 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=1785233193; 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=Q7Pvoqh93L0rQ6LraJvGV/GCmL3zBxdgm/tlZHD36lU=; b=nbongFvG8j4vGEDDzsU/va5ZblIXynPr9EOAZ5FsKVI/bnefQobDTp8O3JkMyY6vbrXFM8 RSnvpQHgpJXAfRZ8/AHVBmCy2Tz4WQObmvSEqX2bYzaCuxKXmZW/VQPij3U0owkMjfSuj7 rW49RZpwg855IMhcm3Jv7F6c48q59f0yyp3G3fDpcfPE4iC0+TKgKO/Aw3qi787u8qSjNN 1EbudTIVa6DDDD9LxEPZhMEZSHgoZyzwuLKo8lyQ2j1vFg1CeibQAYJdwOka0Mj8eyIKvA D8w9dV8QONgYw9ZZioIr1WZ7M917Si+a8LtHyK3UR2ku+N69xhJpukQihGHarg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8WMY2xxVzbvb for ; Tue, 28 Jul 2026 10:06:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f7b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 10:06:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Leidinger Subject: git: 81011ca4c0a8 - stable/15 - exterror tests: harden the checks 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 81011ca4c0a8ba7e7911b128c187de38efa3c59d Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 10:06:33 +0000 Message-Id: <6a687f29.1f7b8.5d13a035@gitrepo.freebsd.org> The branch stable/15 has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=81011ca4c0a8ba7e7911b128c187de38efa3c59d commit 81011ca4c0a8ba7e7911b128c187de38efa3c59d Author: Alexander Leidinger AuthorDate: 2026-07-21 20:39:57 +0000 Commit: Alexander Leidinger CommitDate: 2026-07-28 10:04:52 +0000 exterror tests: harden the checks Skip the message-content check on kernels that do not advertise the exterr_strings feature, and pin the output format by clearing EXTERROR_VERBOSE. Reviewed by: kib MFC after: 1 week Assisted-by: Claude Code (Fable 5) Differential Revision: https://reviews.freebsd.org/D58322 (cherry picked from commit 1092aba1260ce5efb0d718352aa22158605c7506) --- tests/sys/kern/exterr_test.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/tests/sys/kern/exterr_test.c b/tests/sys/kern/exterr_test.c index b4746a485f58..316b5b66b0e0 100644 --- a/tests/sys/kern/exterr_test.c +++ b/tests/sys/kern/exterr_test.c @@ -30,6 +30,20 @@ #include #include #include +#include +#include +#include + +/* + * Pin the message format by clearing EXTERROR_VERBOSE, which would + * otherwise change the output shape. + */ +static void +pin_exterror_format(void) +{ + + unsetenv("EXTERROR_VERBOSE"); +} ATF_TC(gettext_extended); ATF_TC_HEAD(gettext_extended, tc) @@ -41,6 +55,8 @@ ATF_TC_BODY(gettext_extended, tc) char exterr[UEXTERROR_MAXLEN]; int r; + pin_exterror_format(); + /* * Use an invalid call to mmap() because it supports extended error * messages, requires no special resources, and does not need root. @@ -50,8 +66,10 @@ ATF_TC_BODY(gettext_extended, tc) r = uexterr_gettext(exterr, sizeof(exterr)); ATF_CHECK_EQ(0, r); printf("Extended error: %s\n", exterr); + if (feature_present("exterr_strings") == 0) + atf_tc_skip("kernel built without EXTERR_STRINGS"); /* Note: error string may need to be updated due to kernel changes */ - ATF_CHECK(strstr(exterr, " is not subset of ") != 0); + ATF_CHECK(strstr(exterr, " is not subset of ") != NULL); } ATF_TC(gettext_noextended); @@ -65,6 +83,8 @@ ATF_TC_BODY(gettext_noextended, tc) char exterr[UEXTERROR_MAXLEN]; int r; + pin_exterror_format(); + ATF_CHECK_ERRNO(EINVAL, exterrctl(EXTERRCTL_UD, 0, NULL)); r = uexterr_gettext(exterr, sizeof(exterr)); ATF_CHECK_EQ(0, r); @@ -82,6 +102,8 @@ ATF_TC_BODY(gettext_noextended_after_extended, tc) char exterr[UEXTERROR_MAXLEN]; int r; + pin_exterror_format(); + /* * First do something that will create an extended error message, but * ignore it.