From patchwork Mon Sep 11 16:16:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 137904 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp2195955vqo; Mon, 11 Sep 2023 09:49:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQU1TxL4pg8EG7yjL+E7pb6AvjmAnnCbcDVRdijqC2C1QatpsqNcIECdoF7m8AnV0AgeaU X-Received: by 2002:a05:6402:5162:b0:522:2aba:bc3b with SMTP id d2-20020a056402516200b005222ababc3bmr8739409ede.28.1694450952756; Mon, 11 Sep 2023 09:49:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694450952; cv=none; d=google.com; s=arc-20160816; b=oqrzuI5Ku12v+qk45UJYQVTJa9xAiD7Q8OMS0Id00rFB7cEFyb+zHSRR6BTjeYroco BHm/0Ph5ICZUm8yOYfjNdK2/6OIRkKL00wqowzV/ytOz8h/V/vrzneRLvg6QttLJp79U 48NG1jGCNGFycrbhooYr06qihK7+tjzFth+yD7IHMxDJmTmg0Gtt6JYMEL3Qaq0rp/zD J/t6qbiyZlTa0rzewpNxo5rLjZHozEvsheYC16CpewmwR+4sLHWpk9i107L8WzZiPxAk GSiGtzA0HYobfJYCjam/Ga6pWN+gAfheFrqIziUcgU/GM9eCEzYVBFe8gLLylKy3FMk0 WfMw== 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=7QmdZAWdHliJXB841rm+Vqr9S4c5X9Ek1iw4X4eKq7A=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=Zs5yM7oJtwGdsUXzHX8y0LzrNodc2FtMsidDityNUoeMTTCxl1XAXj+Iv0HBTLUxcS 4uaw6m7aw/m04f69geF/ioiT/DsUPZ+0NgkfESJ2QmiXeN2hSITZS53kgc/+xT0DM1Vo lD9alVMThPtu/d0+NuBP8iQL1lJnjElRBcLIuIgJZ05WrvLx+OtZy5OpwGQnZutLf2nq DJRGde+OCZFTWd+VvbyC2NN7eblxkFVKWZbPmHHj74FVpAsFpk5UhuWSQflsHq815Bnp GeCnunzTMgkO7yVmDTRIJ1R46kiC2Gv+Hi5+bBKRBCnW8vrD8kNhjHneeH7/iLnXdczd aqeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=nL0Lze3d; 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 c11-20020aa7c98b000000b005221d280d58si6504793edt.101.2023.09.11.09.49.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 09:49:12 -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=nL0Lze3d; 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 ECD543836EA1 for ; Mon, 11 Sep 2023 16:41:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ECD543836EA1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694450471; bh=7QmdZAWdHliJXB841rm+Vqr9S4c5X9Ek1iw4X4eKq7A=; 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=nL0Lze3dGhDbbTHLNbOeAzmFMadjcEvIB3NA2iiD+5nrYJ97mLds+eVNrF2gEjZjM mywBdlLbdhBn8vQtvTgYvcKWDWgtujWxy9a/nzHOr9QSAqcy2Gyx2JXMk28IKIw0Zm 11CHaYaGS/JWRATUHVylU2lxG42VPkhXCrLwE3I8= 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 ESMTPS id DED36385701E for ; Mon, 11 Sep 2023 16:35:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DED36385701E Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-204-0zSOUvQIOJaJnBt0z-fF6A-1; Mon, 11 Sep 2023 12:35:48 -0400 X-MC-Unique: 0zSOUvQIOJaJnBt0z-fF6A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 022C9299E747; Mon, 11 Sep 2023 16:35:48 +0000 (UTC) Received: from localhost (unknown [10.42.28.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A9912027045; Mon, 11 Sep 2023 16:35:47 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 12/13] libstdc++: Remove dg-options "-std=gnu++2a" from XFAIL std::span tests Date: Mon, 11 Sep 2023 17:16:43 +0100 Message-ID: <20230911163534.1913512-13-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.4 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, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, 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: 1776760602445465482 X-GMAIL-MSGID: 1776760602445465482 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. We can also combine the { dg-require-effective-target c++2a } directive with the dg-do selector. We need to add the no_pch options for tests that define _GLIBCXX_ASSERTIONS in the test, otherwise the PCH is included without that defined. libstdc++-v3/ChangeLog: * testsuite/23_containers/span/back_assert_neg.cc: Remove dg-options and add effective target selector to dg-do. Add no_pch. * testsuite/23_containers/span/back_neg.cc: Likewise. * testsuite/23_containers/span/cons_1_assert_neg.cc: Likewise. * testsuite/23_containers/span/cons_2_assert_neg.cc: Likewise. * testsuite/23_containers/span/first_2_assert_neg.cc: Likewise. * testsuite/23_containers/span/first_assert_neg.cc: Likewise. * testsuite/23_containers/span/first_neg.cc: Likewise. * testsuite/23_containers/span/front_assert_neg.cc: Likewise. * testsuite/23_containers/span/front_neg.cc: Likewise. * testsuite/23_containers/span/index_op_assert_neg.cc: Likewise. * testsuite/23_containers/span/index_op_neg.cc: Likewise. * testsuite/23_containers/span/last_2_assert_neg.cc: Likewise. * testsuite/23_containers/span/last_assert_neg.cc: Likewise. * testsuite/23_containers/span/last_neg.cc: Likewise. * testsuite/23_containers/span/subspan_2_assert_neg.cc: Likewise. * testsuite/23_containers/span/subspan_3_assert_neg.cc: Likewise. * testsuite/23_containers/span/subspan_4_assert_neg.cc: Likewise. * testsuite/23_containers/span/subspan_5_assert_neg.cc: Likewise. * testsuite/23_containers/span/subspan_6_assert_neg.cc: Likewise. * testsuite/23_containers/span/subspan_assert_neg.cc: Likewise. * testsuite/23_containers/span/subspan_neg.cc: Likewise. * testsuite/24_iterators/range_operations/advance_debug_neg.cc: Likewise. --- libstdc++-v3/testsuite/23_containers/span/back_assert_neg.cc | 5 ++--- libstdc++-v3/testsuite/23_containers/span/back_neg.cc | 3 +-- .../testsuite/23_containers/span/cons_1_assert_neg.cc | 5 ++--- .../testsuite/23_containers/span/cons_2_assert_neg.cc | 5 ++--- .../testsuite/23_containers/span/first_2_assert_neg.cc | 5 ++--- .../testsuite/23_containers/span/first_assert_neg.cc | 5 ++--- libstdc++-v3/testsuite/23_containers/span/first_neg.cc | 3 +-- .../testsuite/23_containers/span/front_assert_neg.cc | 5 ++--- libstdc++-v3/testsuite/23_containers/span/front_neg.cc | 3 +-- .../testsuite/23_containers/span/index_op_assert_neg.cc | 5 ++--- libstdc++-v3/testsuite/23_containers/span/index_op_neg.cc | 3 +-- .../testsuite/23_containers/span/last_2_assert_neg.cc | 5 ++--- libstdc++-v3/testsuite/23_containers/span/last_assert_neg.cc | 5 ++--- libstdc++-v3/testsuite/23_containers/span/last_neg.cc | 3 +-- .../testsuite/23_containers/span/subspan_2_assert_neg.cc | 5 ++--- .../testsuite/23_containers/span/subspan_3_assert_neg.cc | 5 ++--- .../testsuite/23_containers/span/subspan_4_assert_neg.cc | 5 ++--- .../testsuite/23_containers/span/subspan_5_assert_neg.cc | 5 ++--- .../testsuite/23_containers/span/subspan_6_assert_neg.cc | 5 ++--- .../testsuite/23_containers/span/subspan_assert_neg.cc | 5 ++--- libstdc++-v3/testsuite/23_containers/span/subspan_neg.cc | 3 +-- .../24_iterators/range_operations/advance_debug_neg.cc | 5 ++--- 22 files changed, 38 insertions(+), 60 deletions(-) diff --git a/libstdc++-v3/testsuite/23_containers/span/back_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/back_assert_neg.cc index 2b4dee6df9a..b42aea3b4b4 100644 --- a/libstdc++-v3/testsuite/23_containers/span/back_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/back_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/back_neg.cc b/libstdc++-v3/testsuite/23_containers/span/back_neg.cc index 01083e60168..d3ea4f405f4 100644 --- a/libstdc++-v3/testsuite/23_containers/span/back_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/back_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/23_containers/span/cons_1_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/cons_1_assert_neg.cc index 2f555125453..10208469cba 100644 --- a/libstdc++-v3/testsuite/23_containers/span/cons_1_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/cons_1_assert_neg.cc @@ -1,6 +1,5 @@ -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_DEBUG #define _GLIBCXX_DEBUG diff --git a/libstdc++-v3/testsuite/23_containers/span/cons_2_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/cons_2_assert_neg.cc index efef0e608ba..e3a3a2678c6 100644 --- a/libstdc++-v3/testsuite/23_containers/span/cons_2_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/cons_2_assert_neg.cc @@ -1,6 +1,5 @@ -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_DEBUG #define _GLIBCXX_DEBUG diff --git a/libstdc++-v3/testsuite/23_containers/span/first_2_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/first_2_assert_neg.cc index 93cd095495a..876a6b773d6 100644 --- a/libstdc++-v3/testsuite/23_containers/span/first_2_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/first_2_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/first_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/first_assert_neg.cc index 4ff56bf65cf..f1d8cdccb9b 100644 --- a/libstdc++-v3/testsuite/23_containers/span/first_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/first_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/first_neg.cc b/libstdc++-v3/testsuite/23_containers/span/first_neg.cc index 8ed68296263..4a8cd184172 100644 --- a/libstdc++-v3/testsuite/23_containers/span/first_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/first_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/23_containers/span/front_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/front_assert_neg.cc index 2d4320d0fd9..12cbd4a80ae 100644 --- a/libstdc++-v3/testsuite/23_containers/span/front_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/front_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/front_neg.cc b/libstdc++-v3/testsuite/23_containers/span/front_neg.cc index f8e8100bd7c..b5525db8f1d 100644 --- a/libstdc++-v3/testsuite/23_containers/span/front_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/front_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/23_containers/span/index_op_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/index_op_assert_neg.cc index b2633cbfaab..c75924e5f38 100644 --- a/libstdc++-v3/testsuite/23_containers/span/index_op_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/index_op_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/index_op_neg.cc b/libstdc++-v3/testsuite/23_containers/span/index_op_neg.cc index 8bbe8ea0737..6e8cd4903b3 100644 --- a/libstdc++-v3/testsuite/23_containers/span/index_op_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/index_op_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/23_containers/span/last_2_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/last_2_assert_neg.cc index 906896911c0..a464fa516b0 100644 --- a/libstdc++-v3/testsuite/23_containers/span/last_2_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/last_2_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/last_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/last_assert_neg.cc index 59cd44acc3c..f36db455519 100644 --- a/libstdc++-v3/testsuite/23_containers/span/last_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/last_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/last_neg.cc b/libstdc++-v3/testsuite/23_containers/span/last_neg.cc index 9c360d2650e..2e86233f19a 100644 --- a/libstdc++-v3/testsuite/23_containers/span/last_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/last_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/23_containers/span/subspan_2_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/subspan_2_assert_neg.cc index 488b5606993..12b79fffc5d 100644 --- a/libstdc++-v3/testsuite/23_containers/span/subspan_2_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/subspan_2_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/subspan_3_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/subspan_3_assert_neg.cc index 8324edfc49a..3130a503534 100644 --- a/libstdc++-v3/testsuite/23_containers/span/subspan_3_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/subspan_3_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/subspan_4_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/subspan_4_assert_neg.cc index b1dbfe6902e..2a57ddf48b8 100644 --- a/libstdc++-v3/testsuite/23_containers/span/subspan_4_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/subspan_4_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/subspan_5_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/subspan_5_assert_neg.cc index 2102fd02cce..48aaeaffbbf 100644 --- a/libstdc++-v3/testsuite/23_containers/span/subspan_5_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/subspan_5_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/subspan_6_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/subspan_6_assert_neg.cc index c003561032c..2c90c5e67f8 100644 --- a/libstdc++-v3/testsuite/23_containers/span/subspan_6_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/subspan_6_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/subspan_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/subspan_assert_neg.cc index c46b78fe8bc..4873c757996 100644 --- a/libstdc++-v3/testsuite/23_containers/span/subspan_assert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/subspan_assert_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-do run { target c++20 xfail *-*-* } } +// { dg-add-options no_pch } #undef _GLIBCXX_ASSERTIONS #define _GLIBCXX_ASSERTIONS diff --git a/libstdc++-v3/testsuite/23_containers/span/subspan_neg.cc b/libstdc++-v3/testsuite/23_containers/span/subspan_neg.cc index 205bafd39dd..3c69f236755 100644 --- a/libstdc++-v3/testsuite/23_containers/span/subspan_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/subspan_neg.cc @@ -15,8 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a" } -// { dg-do compile { target c++2a } } +// { dg-do compile { target c++20 } } #include diff --git a/libstdc++-v3/testsuite/24_iterators/range_operations/advance_debug_neg.cc b/libstdc++-v3/testsuite/24_iterators/range_operations/advance_debug_neg.cc index 4d363c41f7c..b9511822e19 100644 --- a/libstdc++-v3/testsuite/24_iterators/range_operations/advance_debug_neg.cc +++ b/libstdc++-v3/testsuite/24_iterators/range_operations/advance_debug_neg.cc @@ -15,9 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++2a -D_GLIBCXX_ASSERTIONS" } -// { dg-do run { xfail *-*-* } } -// { dg-require-effective-target c++2a } +// { dg-options "-D_GLIBCXX_ASSERTIONS" } +// { dg-do run { target c++20 xfail *-*-* } } #include #include