From nobody Mon Apr 6 09:14:32 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D09DE8834 for ; Fri, 20 Mar 2026 07:00:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773990054; cv=none; b=c95GIdAXfqsBWs9IwfwkjhaHW7mWCiRmeniqa1IjdQovVA8IeiCZHIGVicIGagN6uby7faLUdDD3cqKMLj06TD6z3wYv0dj98hVPrIz8hpVlCEQUzYkHgke+H/8+ZHv3otRDrWY1m4wVJHPCfUgMIAN52DlGTv0vo3hVNcXKQbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773990054; c=relaxed/simple; bh=OT1uzbMX/sa4fWiO4Brc9Zp7W6Q17Tk3JINonMwN1ek=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=M1NOJLd51xRXx9OHGxYfURi8E5JQZXpHIG88rw3Gy/jtAGZElwH20XGt89+vZBJd7m5dfaB0T6md1jZCbo2lpZDCSSkvvGskyekQPzzvbaZvDGEYdoPEMWL53NDIEKq6nG5gWisdnedRo1MOvwBbhA2JttFGM4dlI0wkJVBCOxU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=gxaVebSJ; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="gxaVebSJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1773990050; bh=OT1uzbMX/sa4fWiO4Brc9Zp7W6Q17Tk3JINonMwN1ek=; h=From:Date:Subject:To:Cc:From; b=gxaVebSJYCLiAuwXNekxskE98DmhFCIqkoD/JxeOk73HLrflvYPA6Tvt+zzWqTlhx 9yRpwEdoP+aB4Rb2yT3r4svRTNM/b5Uy0Btgn8fesD5UCNSj3wzwkfSav9m51x8DI8 b/ZfnwHIsG7pALCf33z132/7U7ac6xW5UO2pG05s= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Fri, 20 Mar 2026 08:00:46 +0100 Subject: [PATCH v2] selftests/nolibc: fix libc-test with musl libc Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260320-nolibc-tests-musl-v2-1-5fa468b5ba64@weissschuh.net> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/32NQQrCMBBFryKzdqSJIQZX3kO6sOnEDNRUMmlVS u9u7AFcvgf//QWEMpPAebdAppmFx1RB73fg4y3dCbmvDLrRtjkqh2kcuPNYSIrgY5IBrfLGBqd DRx7q7pkp8HtrXtvKkaWM+bNdzOpn/9VmhQqdM74/BeOssZcXsYj4OMVDogLtuq5f4LsB8LcAA AA= X-Change-ID: 20260318-nolibc-tests-musl-61c46f82fbec To: Willy Tarreau , Daniel Palmer , David Laight Cc: linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773990048; l=3997; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=OT1uzbMX/sa4fWiO4Brc9Zp7W6Q17Tk3JINonMwN1ek=; b=sGVIig/Ks72veOfcSwKdFERoL/x9W52LR+oTYXeNaKnAva25ZzxgiQCBSLJm/6EXZWafsTq1G oOm0ixzg27mABqxrQe+IVU/ij1PRXhgvQoz/UgtPNdDSmeCpCCOyclC X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Some of the nolibc testcases fail on musl. In these cases nolibc mirrors the non-standard behavior of glibc. Avoid the failures by only running these testcases on nolibc and glibc. Fixes: a5f00be9b3b0 ("tools/nolibc: Add a simple test for writing to a FILE= and reading it back") Fixes: d94393e48c09 ("tools/nolibc/printf: Add support for length modifiers= tzqL and formats iX") Fixes: c2d234d3dc56 ("tools/nolibc/printf: Special case 0 and add support f= or %#x") Fixes: 63befd993da4 ("tools/nolibc/printf: Add support for zero padding and= field precision") Fixes: d94393e48c09 ("tools/nolibc/printf: Add support for length modifiers= tzqL and formats iX") Signed-off-by: Thomas Wei=C3=9Fschuh --- Changes in v2: - Also run the affected testcases on glibc. - Link to v1: https://patch.msgid.link/20260318-nolibc-tests-musl-v1-1-884c= d7f48646@weissschuh.net --- I am thinking about folding the printf fixups directly into the original patches. Any objections? --- tools/testing/selftests/nolibc/nolibc-test.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/s= elftests/nolibc/nolibc-test.c index 180611aabbfb..4b653172d570 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -74,6 +74,14 @@ static const int is_nolibc =3D #endif ; =20 +static const int is_glibc =3D +#ifdef __GLIBC__ + 1 +#else + 0 +#endif +; + #if !defined(NOLIBC) /* Some disabled tests may not compile. */ =20 @@ -867,7 +875,7 @@ int test_file_stream(void) =20 errno =3D 0; r =3D fwrite("foo", 1, 3, f); - if (r !=3D 0 || errno !=3D EBADF) { + if (r !=3D 0 || ((is_nolibc || is_glibc) && errno !=3D EBADF)) { fclose(f); return -1; } @@ -1824,13 +1832,13 @@ static int run_printf(int min, int max) CASE_TEST(hex_alt_prec); EXPECT_VFPRINTF(1, "| 0x02|0x03| 0x123|", "|%#5= .2x|%#04x|%#6.2x|", 2, 3, 0x123); break; CASE_TEST(hex_0_alt); EXPECT_VFPRINTF(1, "|0|0000| 00|", "|%#x|%#04= x|%#5.2x|", 0, 0, 0); break; CASE_TEST(pointer); EXPECT_VFPRINTF(1, "0x1", "%p", (void *) 0x1); = break; - CASE_TEST(pointer_NULL); EXPECT_VFPRINTF(1, "|(nil)|(nil)|", "|%p|%.4p|"= , (void *)0, (void *)0); break; - CASE_TEST(string_NULL); EXPECT_VFPRINTF(1, "|(null)||(null)|", "|%s|%.5= s|%.6s|", (void *)0, (void *)0, (void *)0); break; + CASE_TEST(pointer_NULL); EXPECT_VFPRINTF(is_nolibc || is_glibc, "|(nil)|= (nil)|", "|%p|%.4p|", (void *)0, (void *)0); break; + CASE_TEST(string_NULL); EXPECT_VFPRINTF(is_nolibc, "|(null)||(null)|", = "|%s|%.5s|%.6s|", (void *)0, (void *)0, (void *)0); break; CASE_TEST(percent); EXPECT_VFPRINTF(1, "a%d42%69%", "a%%d%d%%%d%%",= 42, 69); break; - CASE_TEST(perc_qual); EXPECT_VFPRINTF(1, "a%d2", "a%-14l%d%d", 2); br= eak; - CASE_TEST(invalid); EXPECT_VFPRINTF(1, "a%12yx3%y42%P", "a%12yx%d%y= %d%P", 3, 42); break; + CASE_TEST(perc_qual); EXPECT_VFPRINTF(is_nolibc || is_glibc, "a%d2", = "a%-14l%d%d", 2); break; + CASE_TEST(invalid); EXPECT_VFPRINTF(is_nolibc || is_glibc, "a%12yx3= %y42%P", "a%12yx%d%y%d%P", 3, 42); break; CASE_TEST(intmax_max); EXPECT_VFPRINTF(1, "9223372036854775807", "%lld= ", ~0ULL >> 1); break; - CASE_TEST(intmax_min); EXPECT_VFPRINTF(1, "-9223372036854775808", "%Li= ", (~0ULL >> 1) + 1); break; + CASE_TEST(intmax_min); EXPECT_VFPRINTF(is_nolibc || is_glibc, "-922337= 2036854775808", "%Li", (~0ULL >> 1) + 1); break; CASE_TEST(uintmax_max); EXPECT_VFPRINTF(1, "18446744073709551615", "%ju= ", ~0ULL); break; CASE_TEST(truncation); EXPECT_VFPRINTF(1, "012345678901234567890123456= 789", "%s", "012345678901234567890123456789"); break; CASE_TEST(string_width); EXPECT_VFPRINTF(1, " 1", "%10s", "1"); = break; --- base-commit: d59131de97ee69ab4e4b8926089a6e953d699b11 change-id: 20260318-nolibc-tests-musl-61c46f82fbec Best regards, --=20 Thomas Wei=C3=9Fschuh