From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 85B663858C62 for ; Mon, 28 Nov 2022 10:09:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 85B663858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669630152; 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: in-reply-to:in-reply-to:references:references; bh=yoUC5UQJumULjiegZ0fuf3HQSILic8cH6We239PYxzc=; b=HS5QHTDErOuNU9D0hiSlsIuFiTdiV91opipInyoA1pehdDVVslrEvc6dFWY9dFgCqBTUkx 5cbV7umCddLcPyXCOqXTEF3Ub+fB6BWVAACWr/qYIEi9VSXyRAMPFiUl7hpF5WSz9tW9F4 hGKPnjlB0RPm28mPjDSLFwiQN1de4+s= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-537-tSjIRj9RM1iyZMCnebjS-A-1; Mon, 28 Nov 2022 05:09:10 -0500 X-MC-Unique: tSjIRj9RM1iyZMCnebjS-A-1 Received: by mail-ej1-f71.google.com with SMTP id nb1-20020a1709071c8100b007ae4083d6f5so4038083ejc.15 for ; Mon, 28 Nov 2022 02:09:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yoUC5UQJumULjiegZ0fuf3HQSILic8cH6We239PYxzc=; b=6/AW60xTclO+lwh5VHMR/HdzGcfq9M2yIs1fuTp03h54ejR4apZrp7vK2YPFQzSBtt qvNDYtvu5eFldDRYTtXHTlHPWLwT3QAlMcv8rzURq0HIzUkigRALDHIj9DG6ldvdYDnx o2KeAAk9KQJhsAtuHRRVKQ2QIQ1SZRoOGoYoGKVEe5/dzv6gY+qfxQygtblWsfX3WnUO knx0fLX/34gmcJDDpHqVulwIPSJYY6XJBDhOAd2Loj2xju4YBL7hHrzJZqfVL5nhl+iK ZSG7CGUjZ2gOjl43zhxLNpUwTsVXWOrgwNEl70AU5IefV0lPgK3qLMPZGrygdAvSqGJm Q7KQ== X-Gm-Message-State: ANoB5pkne8mX4wPxE72grrieLfGVYyXLqClEdQpafIBbd7/C4TWHnesR D7jIdgA8W35feChd9AohhwE5B/LoBlA+u2BMej4AjytaFECd8jEbJ8RfMSaOzrQbJWtmnBWOqP/ Y1fpZETlDr2f5wo7F/PqCwevk/Lg+wQI= X-Received: by 2002:a05:6402:1772:b0:46a:7f4d:efe5 with SMTP id da18-20020a056402177200b0046a7f4defe5mr19748874edb.304.1669630149191; Mon, 28 Nov 2022 02:09:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf4TelxxjESrXW0oFRaKmJjnqFrpaYR5lSRppAZUSLVgwVLQYK1CNQpvHq7ml2IsYnXh+m3wPWqozpIYxnc7mw0= X-Received: by 2002:a05:6402:1772:b0:46a:7f4d:efe5 with SMTP id da18-20020a056402177200b0046a7f4defe5mr19748859edb.304.1669630148938; Mon, 28 Nov 2022 02:09:08 -0800 (PST) MIME-Version: 1.0 References: <323b61ce-7027-bad3-a061-c198d7268a22@gmail.com> In-Reply-To: From: Jonathan Wakely Date: Mon, 28 Nov 2022 10:08:58 +0000 Message-ID: Subject: Re: [PATCH][_GLIBCXX_INLINE_VERSION] Adapt dg error messages To: =?UTF-8?Q?Fran=C3=A7ois_Dumont?= Cc: "libstdc++@gcc.gnu.org" , gcc-patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="000000000000ef2ac505ee850fa2" X-Spam-Status: No, score=-6.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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 List-Id: --000000000000ef2ac505ee850fa2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 28 Nov 2022 at 10:06, Jonathan Wakely wrote: > > > On Mon, 28 Nov 2022 at 06:02, Fran=C3=A7ois 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. --000000000000ef2ac505ee850fa2--