From patchwork Mon Sep 11 16:16:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 137905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp2196133vqo; Mon, 11 Sep 2023 09:49:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZciPL/UUXBRYD03tcoVsKHiDK2HqK3gdzcoaWK1FNLoDEHYuYyW2OcqunVZntp7YYvtrz X-Received: by 2002:aa7:d158:0:b0:523:ba10:d795 with SMTP id r24-20020aa7d158000000b00523ba10d795mr9356454edo.11.1694450970709; Mon, 11 Sep 2023 09:49:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694450970; cv=none; d=google.com; s=arc-20160816; b=WvbdyhnyycITFcGn3lsj2a3Tms4S3Rx57ZDKay3TGfFLHkQyUW1Yrq1IMfz+3GoFs1 ShxxhUhTAlRCGFL9vUmuZzukZeWnEfOene7LfqfPzPu/4SajX6csN11T8ogWjDuLou0h aauI/T7NKA5/FHesEvKR3HPrw4+0cNYYZ4V9iceVCqbLIaN7xv8PuXMVfhUtOfhVmAf6 0dpWlG8MMtw+8S+MD+UmetDgK0qGhsH1BGNM3ylkQwcPe+5l1SmoRGjN3/FkI1H0B119 V3TAHZ8WD8xndvm4ISyQB9gkrJA9Dt3/5q+fgt6z82xupUCUvF653cqz68MZ9OCSPt6r r5ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=ji/toJDqcUdD5kERfqNIDghbuNyxBB3vj/BH6y3jo6E=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=RLvE56KRfek4WPjwEJbYzI+GFVTBW1Niq9llJ+NSMWIXbwZg2Rt3tqubhbzmJhbcZB ujT+dC4rfzvL++UpYCozySikUd9YC4TovMcz+Up21Aekn8G0ZPm4fHUdU9qjlRFNdjKS 324Lin77COzdCc1Az2DkR7Jc3uRIzu3GDuOS63r9u3lkkRNkNnWwwsmLpDG7cznfSvCs qW93qUMhYb+rBnRZXRitr4/yXMXZ7J30X0UgKOm29fZdvag0mFdGSNOrJi5hMP0T9gQ7 65rOPASDftIKKkPmbsYSbg6xMpD3G5kl16549N8WCThs1/zp7LYgY15zD8ACMM6b+vcR DeMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=fOaTVQRm; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id n14-20020aa7db4e000000b0052a1d9ed739si6666048edt.692.2023.09.11.09.49.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 09:49:30 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=fOaTVQRm; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A5CD7389367C for ; Mon, 11 Sep 2023 16:41:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5CD7389367C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694450486; bh=ji/toJDqcUdD5kERfqNIDghbuNyxBB3vj/BH6y3jo6E=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=fOaTVQRmuoLviSEznMiNCq6NwrAXFEpIkwXTd+CUnBh5lfGgA5cPMZ7waU3KLdDd2 VEhTBShcqDw6ypxYQ5vozZURqQGIdOl75r62MYI1siE2R7WEnqwmJaeHcbOZWXPauy LRxZWEbX4FtKe+XscPxNDJhECZIAKeyAUSNbTT84= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 8F91B3858025 for ; Mon, 11 Sep 2023 16:35:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8F91B3858025 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-651-uG8874yDNOKWxNmc9GumIA-1; Mon, 11 Sep 2023 12:35:40 -0400 X-MC-Unique: uG8874yDNOKWxNmc9GumIA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3CC9928B82; Mon, 11 Sep 2023 16:35:39 +0000 (UTC) Received: from localhost (unknown [10.42.28.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA08340C6EA8; Mon, 11 Sep 2023 16:35:39 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 05/13] libstdc++: Remove dg-options "-std=c++20" from and tests Date: Mon, 11 Sep 2023 17:16:36 +0100 Message-ID: <20230911163534.1913512-6-jwakely@redhat.com> In-Reply-To: <20230911163534.1913512-1-jwakely@redhat.com> References: <20230911163534.1913512-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable 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: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776760621137870833 X-GMAIL-MSGID: 1776760621137870833 The testsuite will automatically select C++20 for these tests now, and removing the hardcoded -std option allows them to be tested for C++23 and C++26 as well. There doesn't seem to be any reason they need to use strict -std=c++20 mode, so don't add the { dg-add-options strict_std } directive, just let them use strict or non-strict modes. libstdc++-v3/ChangeLog: * testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc: Remove dg-options. * testsuite/23_containers/span/contiguous_range_neg.cc: Likewise. * testsuite/23_containers/span/everything.cc: Likewise. --- .../testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc | 1 - .../testsuite/23_containers/span/contiguous_range_neg.cc | 3 +-- libstdc++-v3/testsuite/23_containers/span/everything.cc | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc b/libstdc++-v3/testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc index df68fb7c82f..1964803cbd1 100644 --- a/libstdc++-v3/testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc +++ b/libstdc++-v3/testsuite/21_strings/headers/cuchar/functions_std_cxx20.cc @@ -1,4 +1,3 @@ -// { dg-options "-std=c++20" } // { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/23_containers/span/contiguous_range_neg.cc b/libstdc++-v3/testsuite/23_containers/span/contiguous_range_neg.cc index d5f64922052..2ed44740a86 100644 --- a/libstdc++-v3/testsuite/23_containers/span/contiguous_range_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/contiguous_range_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=c++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include #include diff --git a/libstdc++-v3/testsuite/23_containers/span/everything.cc b/libstdc++-v3/testsuite/23_containers/span/everything.cc index 74f943e937f..31c17346dd3 100644 --- a/libstdc++-v3/testsuite/23_containers/span/everything.cc +++ b/libstdc++-v3/testsuite/23_containers/span/everything.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=c++2a" } -// { dg-do run { target c++2a } } +// { dg-do run { target c++20 } } #include