From patchwork Mon Dec 27 20:23:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 49318 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 871FF385843D for ; Mon, 27 Dec 2021 20:23:44 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hera.aquilenet.fr (hera.aquilenet.fr [185.233.100.1]) by sourceware.org (Postfix) with ESMTPS id 714EB3858D3C for ; Mon, 27 Dec 2021 20:23:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 714EB3858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 946F835A; Mon, 27 Dec 2021 21:23:29 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p5uoHKwdkisb; Mon, 27 Dec 2021 21:23:29 +0100 (CET) Received: from begin.home (2a01cb0088600700de41a9fffe47ec49.ipv6.abo.wanadoo.fr [IPv6:2a01:cb00:8860:700:de41:a9ff:fe47:ec49]) by hera.aquilenet.fr (Postfix) with ESMTPSA id F1FF2172; Mon, 27 Dec 2021 21:23:28 +0100 (CET) Received: from samy by begin.home with local (Exim 4.95) (envelope-from ) id 1n1wWl-00CVOa-Az; Mon, 27 Dec 2021 21:23:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Subject: [hurd, commited] stdio-common: Fix %m sprintf test output for GNU/Hurd Date: Mon, 27 Dec 2021 21:23:27 +0100 Message-Id: <20211227202327.2980613-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spamd-Bar: ++++ X-Rspamd-Server: hera Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Queue-Id: 946F835A X-Spamd-Result: default: False [4.90 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; MID_CONTAINS_FROM(1.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[] X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: commit-hurd@gnu.org Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" GNU/Hurd has slightly different error messages for undefined numbers, due to the notion of error subsystems. --- stdio-common/tst-sprintf-errno.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/stdio-common/tst-sprintf-errno.c b/stdio-common/tst-sprintf-errno.c index 7622fdbc48..f5b587f0fe 100644 --- a/stdio-common/tst-sprintf-errno.c +++ b/stdio-common/tst-sprintf-errno.c @@ -48,16 +48,26 @@ do_test (void) TEST_COMPARE_STRING (buf, "0"); errno = -1; +#ifdef __GNU__ + TEST_COMPARE (sprintf (buf, "%m"), 35); + TEST_COMPARE_STRING (buf, "Error in unknown error system: : -1"); +#else TEST_COMPARE (sprintf (buf, "%m"), 16); TEST_COMPARE_STRING (buf, "Unknown error -1"); +#endif errno = -1; TEST_COMPARE (sprintf (buf, "%#m"), 2); TEST_COMPARE_STRING (buf, "-1"); errno = 1002003; +#ifdef __GNU__ + TEST_COMPARE (sprintf (buf, "%m"), 42); + TEST_COMPARE_STRING (buf, "(system kern) error with unknown subsystem"); +#else TEST_COMPARE (sprintf (buf, "%m"), 21); TEST_COMPARE_STRING (buf, "Unknown error 1002003"); +#endif errno = 1002003; TEST_COMPARE (sprintf (buf, "%#m"), 7);