From patchwork Wed Jul 31 12:20:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1967080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TMikPoru; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WYrtg6NbYz1yYq for ; Wed, 31 Jul 2024 22:26:35 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D3EF385843B for ; Wed, 31 Jul 2024 12:26:34 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 90BF53858C56 for ; Wed, 31 Jul 2024 12:26:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 90BF53858C56 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 90BF53858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722428771; cv=none; b=O3FFi+tyOcqG69Q1apNYrZcJvWJAD9KgR2W9A6ZXaZgKujmCbt4yNsv960erD2WdlW9gz4xmL8wZtvcyVyg29K9Bog4q1oAjwEq6EDWdCvRCsf0SZJt11TTr2VC906Tw0nxdlS3IvtR/lBisAPQ6j1KlcC4pHj7uQ2MNdr5X19g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722428771; c=relaxed/simple; bh=EUFgzR3yrczA+I3uIM9wuboVlWNayGvqOc9Xv9tMcEU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=vojHReYHg0isB4Y73UMlf8rlujHxzMOJJ1MYluCxXRkLG1e64FYnWmm3/NArlsy4Epo0fo67WRRs6PK2mO3nf4e6xcJ/RtaPZ504svpK4YSI1SYCBBmQyD3sd4E/sK5LmU0XMY12pxuFnoWm5nJODNt+KMqa61w0GnBp8KZKd54= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722428770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y6/nkmRJfF0gDR/JiK8wA5sQIBg7TfRxx3jjYE3oZik=; b=TMikPoruYtTZwQ7Qdx3XqdzrKe2MvsIPWLhxaCdo+LhFLzyGPNFwP4ehbzlzpK6J0bu9Y7 oMjPvc8MQfWAiViwBaacQMDa+xsRNhgS1cBKrrlefmb8FycZ+Cny9CBpQQQun8w61Pq9qD oqs8DQm6cZtS7uOiXb4xCBfuh+bKr50= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-hA6ryqA3MEaIZNX9xxl4sg-1; Wed, 31 Jul 2024 08:26:08 -0400 X-MC-Unique: hA6ryqA3MEaIZNX9xxl4sg-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6702B1955BEE; Wed, 31 Jul 2024 12:26:05 +0000 (UTC) Received: from localhost (unknown [10.42.28.21]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2D2AD19560AA; Wed, 31 Jul 2024 12:26:03 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Rainer Orth Subject: [PATCH] libstdc++: Only append "@euro" to locale names for Glibc testing Date: Wed, 31 Jul 2024 13:20:12 +0100 Message-ID: <20240731122602.21724-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org I doubt we want the @euro suffix anywhere except Glibc-based targets. We certainly don't want to append "@euro" on Solaris, where this change flips some tests from UNSUPPORTED to PASS, e.g. 21_strings/basic_string/numeric_conversions/char/to_string_float.cc It will probably also cause some to flip from UNSUPPORTED to FAIL, which we'll need to address. Let's restrict it to Glibc. Tested x86_64-linux and sparc-solaris11.4. -- >8 -- The testsuite automatically appends "@euro" to "xx.ISO8859-15" locale names on all targets except FreeBSD, DragonflyBSD, and NetBSD. It should only be for Glibc, not all non-BSD targets. libstdc++-v3/ChangeLog: * testsuite/lib/libstdc++.exp (check_v3_target_namedlocale): Only append "@euro" to ".ISO8859-15" locales for Glibc. --- libstdc++-v3/testsuite/lib/libstdc++.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 18331c80bc2..2510c7f4cbb 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -1032,7 +1032,7 @@ proc check_v3_target_namedlocale { args } { puts $f " strcpy(result, name);" puts $f "#if defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__" puts $f " /* fall-through */" - puts $f "#else" + puts $f "#elif defined __GLIBC__" puts $f " if (strstr(result, \"ISO8859-15\")) {" puts $f " strcat(result, \"@euro\");" puts $f " }"