From nobody Tue Jul 21 20:50:47 2026 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 4h4V0770Xfz6mRSn for ; Tue, 21 Jul 2026 20:50:47 +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 4h4V074q0Lz3VLW for ; Tue, 21 Jul 2026 20:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784667047; 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=8pOUh3tXa/ipvHJ6aW+IvvYvfFYQ4m6iTv+98f5Jg0w=; b=wDHl+FXStN+UE4FrUZlmtBQUn0Dcyj50z7kCa5rV8OgMlBma+lR5bVnNo/vMDDgvMykRDb nABwSDhnVTzobHAKKwTmYOvVm3D5N0yhyKhsJHvYTWMdqKA6Mp71V1vq9gsaAdayn0YCiH cwmwDIOkar3A3SewBk7/qeCrWVKlA3PlX6ROJSrcAfX83e25Bo0gWP6cs+ST0KL8NoW+Cs lHkD9wUQtq7WRch4GAIz/d8TwjkPsjOOu54/Ep4cKNUkF7ShJ6ulm7RRRDlEQKbgacRc2b IDWMsM7wTJRMQy05NvVjPY2R3VHO0qTjjguvbMbMg4VpBV1+y/0NN9W14G1vIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784667047; a=rsa-sha256; cv=none; b=g9/GlxaCF3olPlBlgdrgxTdCJith0STr5xDiRhvs1nG1UrBy28nXTxpdrh5NARcNOU/Vfz zRwyUjju2U/X58ne6WVgcDUJ5rApt/S2hH7geb7xgkMUXg6IWuotbvw4ZjTK+E0kdJaZnN WAtH7BNR9vkSVZBZzeaktLZWYo8WLFbqnQjjM/vgwgoxm/Qc07/ayoOK6NUrXRgHji0zyQ vzukgROwCmwLtO2BiR/mWyPfFV1mYeNWlEUIz0xP1wSJWyQLYySPmVzj38Q8TuHumNuL5C v2p85VCMgNg2cJyxNLerkjHoxDie7SiyaK+H06OLPITmbJe0lLEjBBuvhhN2rw== 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=1784667047; 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=8pOUh3tXa/ipvHJ6aW+IvvYvfFYQ4m6iTv+98f5Jg0w=; b=SlHuWwj9JVKm/VyXBjPgWedLBydk/x5F9MuDI66/hC7hAT++aXh9s0ct882I4in4T0Q98a McrXuEd7rKzWV4SfQg/wAgy19ie7AgPAeARs2lNUtxcJvflURAXuXPtMwQxOJueMKRz4ag UZCKU+Jm7Ii8tMQSCqGcg7zVN70ESS0eX0hoHE2W7/hSe238eeJMXw1tFZLZuiJkzQ1yeN CyH7FMp2q+uyr/OSZu2YPRRFmvrtp2fYqee+803o62QAnMxpreWrSRBjd73c62zvDFn81+ BdYcco777Kkgmwouohmj2tFqEkyHH6YHIp3/Y2V5Q12QESsA52LkhP3YHltdzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4V073QxGz14KH for ; Tue, 21 Jul 2026 20:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 274bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 20:50:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: 1092aba1260c - main - exterror tests: harden the 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 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/main X-Git-Reftype: branch X-Git-Commit: 1092aba1260ce5efb0d718352aa22158605c7506 Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 20:50:47 +0000 Message-Id: <6a5fdba7.274bf.620af054@gitrepo.freebsd.org> The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=1092aba1260ce5efb0d718352aa22158605c7506 commit 1092aba1260ce5efb0d718352aa22158605c7506 Author: Alexander Leidinger AuthorDate: 2026-07-21 20:39:57 +0000 Commit: Alexander Leidinger CommitDate: 2026-07-21 20:50:37 +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 --- 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.