From patchwork Wed Jun 28 03:28:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1800850 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=NMC/GO5o; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QrRs30BPzz20ZV for ; Wed, 28 Jun 2023 13:29:27 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C62BF3858414 for ; Wed, 28 Jun 2023 03:29:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C62BF3858414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687922964; bh=uJC4sF0Sa8q+A2JPh0iHh4iqGi/Oqah4wYBNWkygmwI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=NMC/GO5o2GFf+jfBYMnMSG65Hwt82mBNuPv5muec+QMoFPsWBGHQEckgof9UUrrEr niSy3bJwjBh2DQL20RiPmMx4ZIOsKfax1ftycJnM2z4GiGq6IXH/j2ZC5w6bEBZ4O7 /LV1vuw2/rGBv52FkaAieejb3WfwSAS8+YS0LSBI= 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 53B5A3858D35 for ; Wed, 28 Jun 2023 03:29:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 53B5A3858D35 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-437-I7Rn2lKhNOmW0GE2_WXyMg-1; Tue, 27 Jun 2023 23:29:03 -0400 X-MC-Unique: I7Rn2lKhNOmW0GE2_WXyMg-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-635e3871cf9so27137806d6.1 for ; Tue, 27 Jun 2023 20:29:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687922942; x=1690514942; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uJC4sF0Sa8q+A2JPh0iHh4iqGi/Oqah4wYBNWkygmwI=; b=P/MBuGYn7R5fLRTmgjl0VmPAFeYO74vjrvIXQf/JGSe5gdNua0uEmq0aqGBX7M8AC1 VnvltQVDMSi123NHM8AjAmuiQ0/VwO9OJGaKafmaPiWk5f6gTRRgu1rwStDmhQvLR13z E84iK/ZR3jYa0myLTBTeNUsEbxgy3KVxmse6r3rcI5yDzrQNdRfR40VQaUpRxVbTMdzH ivwbfossbG9HS6etL/IO/mYWGVVOUxWcovx8+mvuQcRm3OMQGsPPqD57Mw9gX9LFH//d MeuTrvLIeSmgmqT1jrArf3U6cCumkGq5cWHRO9XGdaBeKOaQ109JUtfBf7JxBdVHVeVP Vctg== X-Gm-Message-State: AC+VfDyVdVrBE5/l2Fz3uhSsXHihKceeP5aVB62bn6EzTRk+iOajsXfF 0z3NJhl6cdLCA7D1NDqtZxWqaGnYCu0ZJkZ08N2thpqbJf42vLGHrsNTrkdoYhLNwTZq8W125Zf Ihr0deP6DmmM+WAKGVH84lOQaRMKzaIAwpvbMEgm5UyQx+S2LMNeci+0X5Q7fLegTGDIRHj/Ahw == X-Received: by 2002:a05:6214:2302:b0:626:3375:6fea with SMTP id gc2-20020a056214230200b0062633756feamr40507561qvb.22.1687922942711; Tue, 27 Jun 2023 20:29:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6clXwlINXBfwYy9OpxHC1pq3Cg8+iEE1zrzC2J35rRGecejmCVlyzyvqvEDXlC285xcXv1YA== X-Received: by 2002:a05:6214:2302:b0:626:3375:6fea with SMTP id gc2-20020a056214230200b0062633756feamr40507550qvb.22.1687922942263; Tue, 27 Jun 2023 20:29:02 -0700 (PDT) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id q11-20020ad4402b000000b00631ecb1052esm5270778qvp.74.2023.06.27.20.29.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 20:29:01 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] testsuite: std_list handling for { target c++26 } Date: Tue, 27 Jun 2023 23:28:58 -0400 Message-Id: <20230628032858.2614753-1-jason@redhat.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 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_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- As with c++23, we want to run { target c++26 } tests even though it isn't part of the default std_list. C++17 with Concepts TS is no longer an interesting target configuration. And bump the impcx target to use C++26 mode instead of 23. gcc/testsuite/ChangeLog: * lib/g++-dg.exp (g++-dg-runtest): Update for C++26. --- gcc/testsuite/lib/g++-dg.exp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) base-commit: ebe7c586f62b1c5218b19c3c6853163287b3c887 diff --git a/gcc/testsuite/lib/g++-dg.exp b/gcc/testsuite/lib/g++-dg.exp index 08185a8987e..046d63170c8 100644 --- a/gcc/testsuite/lib/g++-dg.exp +++ b/gcc/testsuite/lib/g++-dg.exp @@ -58,17 +58,17 @@ proc g++-dg-runtest { testcases flags default-extra-flags } { # single test. This should be updated or commented # out whenever the default std_list is updated or newer # C++ effective target is added. - if [search_for $test "{ dg-do * { target c++23 } }"] { - set std_list { 23 } + if [search_for $test "\{ dg-do * \{ target c++23"] { + set std_list { 23 26 } + } elseif [search_for $test "\{ dg-do * \{ target c++26"] { + set std_list { 26 } } else { set std_list { 98 14 17 20 } } } set option_list { } foreach x $std_list { - # Handle "concepts" as C++17 plus Concepts TS. - if { $x eq "concepts" } then { set x "17 -fconcepts" - } elseif { $x eq "impcx" } then { set x "23 -fimplicit-constexpr" } + if { $x eq "impcx" } then { set x "26 -fimplicit-constexpr" } lappend option_list "${std_prefix}$x" } } else {