Message ID | 323b61ce-7027-bad3-a061-c198d7268a22@gmail.com |
---|---|
State | Accepted |
Headers |
Return-Path: <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5456807wrr; Sun, 27 Nov 2022 22:02:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf7GfoLOKT8NMzj+Io7nCFWbA+lQdYuPQRD6VQmmFd0KJvFsqdJbNwh0355Bmq6GzXTcCLEy X-Received: by 2002:a17:906:4dcb:b0:7bb:d6e5:6b1c with SMTP id f11-20020a1709064dcb00b007bbd6e56b1cmr15720950ejw.104.1669615330203; Sun, 27 Nov 2022 22:02:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669615330; cv=none; d=google.com; s=arc-20160816; b=m7vzcMa1fwMasYAd/0qSMWPTjTE1yVMwkW+wmcUxfBTIAU6dh37IlEVnlTtM8DwkFQ 4eT6l1f4sOM/IyVURNw4hytDevqBST1H+dQGqua9Rvd7eDWxgYQVju3L2+bY8C4l/G3+ AQqFWDv0nn/tlW/aHO65XHbtibb5zXQnxS7W4Otw9HWTPeP9877DodrNeJuu9Z0M95G/ PHp+xI3SYUNVmZ537GqEUNf94E+ztV97Uts2c9vlMLhy7Vb+3S5dNaxq+YHZAEWS2sXt M/La+eg7FVShzK8/TL1Sd0QC5L34Wxrh3Ym+4by1L6RHsglACfA5nfr+ye5NokJG0g4J Bkxg== 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:subject:cc:to :content-language:user-agent:mime-version:date:message-id :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=dyy/6Kue2PQSdsgyM2m60R1PybZHE2RXu2dsJiWHf84=; b=omEIyomCDPebYIY2MdfBEwXrYYyl/p8OtB7ZQapEUnPHVrc9SEhFPqcZ9zljph5TCO 10K/kawGsb/8WdsjYkpuGI/qhslp8ToDEkHItkXMhrCGxDeB8P2mjYriKoqnwaGRmko0 uGr6GU2acKoqdErBAHMYzl/7GhTDsym29m7hv2mH/OnOczCyECrxulrvkSYXLteixdjr bNceXmYrUlaUyNoyDHk3/wX+gGJG54EU8hA9Q9MKeKCUlhDEtXCKKptnzWNa5aPcAvSu BoSEmk3l+VeI20Hs8gp+9d6WZLz0vO40IbbcjlpwXRf+pqQANiR3weDhpeQ0uIvHrnvP tMbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ehrHFvnk; 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 sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id e16-20020a17090658d000b007be835e8f3esi3655025ejs.582.2022.11.27.22.02.10 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 22:02:10 -0800 (PST) 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=ehrHFvnk; 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 3A9DE385800A for <ouuuleilei@gmail.com>; Mon, 28 Nov 2022 06:02:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3A9DE385800A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669615329; bh=dyy/6Kue2PQSdsgyM2m60R1PybZHE2RXu2dsJiWHf84=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ehrHFvnkTrr6rJMZ/IB6LzMosKoytgVPDXunVO5pmwpJfnBY3eoqeZZysrW+Y5ioX NAZO0ZlGjUdj984O0DFsWuA7iSG6vhsHCrM0yns1IYu0eFmT7SiZSUyNVIMLvyIKnr pHztYRYwRPYecyuVQc5I6aFs4XGLIW0DNj3ajAi0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id DD44F3858C5E; Mon, 28 Nov 2022 06:01:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DD44F3858C5E Received: by mail-ed1-x531.google.com with SMTP id s5so13962347edc.12; Sun, 27 Nov 2022 22:01:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dyy/6Kue2PQSdsgyM2m60R1PybZHE2RXu2dsJiWHf84=; b=ELew+conPt6zNBPJMBfUpJF3gYxOtoZUF0NBvVezCbAGI9o+XcEsSJl7S1SH2W4N4V CIDM6mUdpsUEjxLO/rRPXqCA8DLna1VRbj3TNx1d77tTSpbSThHIDhFL9I6bYGWJ1E8X k5MDygdeg8k1JeZavh3x4SneA/T0hIi61IT6dzD9IgjzmPTMnut8PVffqgJd0DGY+62f 3UjU7QQALGt07NMDAlF213I3SLB7u7RIdBYnL6TcaT8xFBaXA7v/sPN1XT94Kh9h3+hh Fbyn4SU9ghUyP1Qtj/HtDJVH+aGhzkhbwILN7NJlf9loz2DJRd/brd0Q13VFlhTxn1V8 P7MQ== X-Gm-Message-State: ANoB5pkMtT3ke5cBKRdrrwHLToi7EnWLY8FzimwBs7HlfD7D1j8V+Qc5 l0c7XrMMwtvK9qtEb+CjEz16nRdu/ho= X-Received: by 2002:a05:6402:285:b0:46a:878c:e8e9 with SMTP id l5-20020a056402028500b0046a878ce8e9mr18190380edv.306.1669615284359; Sun, 27 Nov 2022 22:01:24 -0800 (PST) Received: from [10.53.0.251] ([109.190.253.15]) by smtp.googlemail.com with ESMTPSA id 24-20020a170906319800b007aed2057eaesm4507879ejy.161.2022.11.27.22.01.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Nov 2022 22:01:23 -0800 (PST) Content-Type: multipart/mixed; boundary="------------d82qATB4l2OjavzbIUX2HrjI" Message-ID: <323b61ce-7027-bad3-a061-c198d7268a22@gmail.com> Date: Mon, 28 Nov 2022 07:01:22 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Content-Language: fr To: "libstdc++@gcc.gnu.org" <libstdc++@gcc.gnu.org> Cc: gcc-patches <gcc-patches@gcc.gnu.org> Subject: [PATCH][_GLIBCXX_INLINE_VERSION] Adapt dg error messages X-Spam-Status: No, score=-6.0 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_PASS, 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.29 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> From: =?utf-8?q?Fran=C3=A7ois_Dumont_via_Gcc-patches?= <gcc-patches@gcc.gnu.org> Reply-To: =?utf-8?q?Fran=C3=A7ois_Dumont?= <frs.dumont@gmail.com> Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750718564456528294?= X-GMAIL-MSGID: =?utf-8?q?1750718564456528294?= |
Series |
[_GLIBCXX_INLINE_VERSION] Adapt dg error messages
|
|
Checks
Context | Check | Description |
---|---|---|
snail/gcc-patch-check | success | Github commit url |
Commit Message
François Dumont
Nov. 28, 2022, 6:01 a.m. UTC
libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages libstdc++-v3/ChangeLog * testsuite/20_util/bind/ref_neg.cc: Adapt dg-prune-output message. * testsuite/20_util/function/cons/70692.cc: Adapt dg-error message. Ok to commit ? François
Comments
On Mon, 28 Nov 2022 at 06:02, François Dumont via Libstdc++ < libstdc++@gcc.gnu.org> wrote: > libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages > > libstdc++-v3/ChangeLog > > * testsuite/20_util/bind/ref_neg.cc: Adapt dg-prune-output > message. > * testsuite/20_util/function/cons/70692.cc: Adapt dg-error > message. > > Ok to commit ? > > OK, thanks.
On Mon, 28 Nov 2022 at 10:06, Jonathan Wakely <jwakely@redhat.com> wrote: > > > On Mon, 28 Nov 2022 at 06:02, François Dumont via Libstdc++ < > libstdc++@gcc.gnu.org> wrote: > >> libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages >> >> libstdc++-v3/ChangeLog >> >> * testsuite/20_util/bind/ref_neg.cc: Adapt dg-prune-output >> message. >> * testsuite/20_util/function/cons/70692.cc: Adapt dg-error >> message. >> >> Ok to commit ? >> >> > OK, thanks. > > > Actually wait, can you test this instead? --- a/libstdc++-v3/testsuite/lib/prune.exp +++ b/libstdc++-v3/testsuite/lib/prune.exp @@ -37,6 +37,8 @@ proc libstdc++-dg-prune { system text } { return "::unsupported::hosted C++ headers not supported" } + regsub -all "std::__8::" $text "std::" text + # Ignore caret diagnostics. Unfortunately dejaGNU trims leading # spaces, so one cannot rely on them being present. regsub -all "(^|\n)\[^\n\]+\n *\\^\n" $text "\n" text This should mean we can stop needing to make these changes to every test, and just write the tests naturally.
On Mon, 28 Nov 2022 at 10:08, Jonathan Wakely <jwakely@redhat.com> wrote: > > > On Mon, 28 Nov 2022 at 10:06, Jonathan Wakely <jwakely@redhat.com> wrote: > >> >> >> On Mon, 28 Nov 2022 at 06:02, François Dumont via Libstdc++ < >> libstdc++@gcc.gnu.org> wrote: >> >>> libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages >>> >>> libstdc++-v3/ChangeLog >>> >>> * testsuite/20_util/bind/ref_neg.cc: Adapt dg-prune-output >>> message. >>> * testsuite/20_util/function/cons/70692.cc: Adapt dg-error >>> message. >>> >>> Ok to commit ? >>> >>> >> OK, thanks. >> >> >> > Actually wait, can you test this instead? > > --- a/libstdc++-v3/testsuite/lib/prune.exp > +++ b/libstdc++-v3/testsuite/lib/prune.exp > @@ -37,6 +37,8 @@ proc libstdc++-dg-prune { system text } { > return "::unsupported::hosted C++ headers not supported" > } > > + regsub -all "std::__8::" $text "std::" text > + > # Ignore caret diagnostics. Unfortunately dejaGNU trims leading > # spaces, so one cannot rely on them being present. > regsub -all "(^|\n)\[^\n\]+\n *\\^\n" $text "\n" text > > This should mean we can stop needing to make these changes to every test, > and just write the tests naturally. > That only helps for dg-prune-output but we still need to (__8::)? for dg-error. Please push your change to 20_util/function/cons/70692.cc but not the change to 20_util/bind/ref_neg.cc (the latter will get fixed after I pushed the prune.expo change).
On 28/11/22 14:39, Jonathan Wakely wrote: > > > On Mon, 28 Nov 2022 at 10:08, Jonathan Wakely <jwakely@redhat.com> wrote: > > > > On Mon, 28 Nov 2022 at 10:06, Jonathan Wakely <jwakely@redhat.com> > wrote: > > > > On Mon, 28 Nov 2022 at 06:02, François Dumont via Libstdc++ > <libstdc++@gcc.gnu.org <mailto:libstdc%2B%2B@gcc.gnu.org>> wrote: > > libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages > > libstdc++-v3/ChangeLog > > * testsuite/20_util/bind/ref_neg.cc: Adapt > dg-prune-output message. > * testsuite/20_util/function/cons/70692.cc: Adapt > dg-error message. > > Ok to commit ? > > > OK, thanks. > > > > Actually wait, can you test this instead? > > --- a/libstdc++-v3/testsuite/lib/prune.exp > +++ b/libstdc++-v3/testsuite/lib/prune.exp > @@ -37,6 +37,8 @@ proc libstdc++-dg-prune { system text } { > return "::unsupported::hosted C++ headers not supported" > } > > + regsub -all "std::__8::" $text "std::" text > + > # Ignore caret diagnostics. Unfortunately dejaGNU trims leading > # spaces, so one cannot rely on them being present. > regsub -all "(^|\n)\[^\n\]+\n *\\^\n" $text "\n" text > > This should mean we can stop needing to make these changes to > every test, and just write the tests naturally. > > > That only helps for dg-prune-output but we still need to (__8::)? for > dg-error. > > Please push your change to 20_util/function/cons/70692.cc but not the > change to 20_util/bind/ref_neg.cc (the latter will get fixed after I > pushed the prune.expo change). > > Done as requested and I confirm that prune.exp enhancement fixed 20_util/bind/ref_neg.cc. Thanks
diff --git a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc index a78935775c2..830b30eae6c 100644 --- a/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc +++ b/libstdc++-v3/testsuite/20_util/bind/ref_neg.cc @@ -50,7 +50,7 @@ void test02() // Ignore the reasons for deduction/substitution failure in the headers. // Arrange for the match to work on installed trees as well as build trees. -// { dg-prune-output "no type named 'type' in 'struct std::result_of" } +// { dg-prune-output "no type named 'type' in 'struct std::(__8::)?result_of" } int main() { diff --git a/libstdc++-v3/testsuite/20_util/function/cons/70692.cc b/libstdc++-v3/testsuite/20_util/function/cons/70692.cc index f9e8fe31570..b15208a2531 100644 --- a/libstdc++-v3/testsuite/20_util/function/cons/70692.cc +++ b/libstdc++-v3/testsuite/20_util/function/cons/70692.cc @@ -11,4 +11,4 @@ int main() std::function<const int&()> ff(f); // { dg-error "no matching function" } std::function<long&&()> f2(f); // { dg-error "no matching function" } } -// { dg-error "std::enable_if" "" { target *-*-* } 0 } +// { dg-error "std::(__8::)?enable_if" "" { target *-*-* } 0 }