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.133.124]) by sourceware.org (Postfix) with ESMTPS id B5325384EF42 for ; Mon, 28 Nov 2022 13:39:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B5325384EF42 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=1669642788; 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=aVMT5i7dJ0Trx5XpYDj6nP7GFteba4F3q5E8eAzXOfU=; b=Ndab+ncpJ63H/wS8PxzJ45t199EZQ58JAZEZFm0DicJbHjTw6zjPzNKcpmxCXcHEwGD6ks qpsUbd/xSFnOcz3UXMXS/805FnfWwVXvzzTWUnamx3a5v77cSg/IhbomQYE4l194TbxuIM xjo/VjUEuL8X0gNEUnNe2bwfiWsq5QQ= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-74-AhYxqT_pNci2FSyNy_mn1g-1; Mon, 28 Nov 2022 08:39:46 -0500 X-MC-Unique: AhYxqT_pNci2FSyNy_mn1g-1 Received: by mail-ej1-f69.google.com with SMTP id qk16-20020a1709077f9000b007c080a6b4ddso114162ejc.18 for ; Mon, 28 Nov 2022 05:39:46 -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=aVMT5i7dJ0Trx5XpYDj6nP7GFteba4F3q5E8eAzXOfU=; b=TzhOdCCCRpwqr9yYp8VXnyWOkQYrsuzbfMBs9J3EPtDCqHlY9MF6LYf0yqOJ3ic8vE 2lxLEOccqAEEWwzNqSblTmBkaOZ9IHyS1xcVvJg3tUiHubCW7AI+4EaS9oAmYRFjPzjT rzPjujWBSB2m/rE1vsTQR5ZFzagZ8WeD8f2BG7+jRyl2Oe+YE+pK+dBP8e5IziXAPyxh pjh4cCG6jSkMHz6m2i/prS3Zzto2RJOgO7Dahd6YPz5TRIiefYjDMMSheowdThRIWvCy FMU9qm9Wdj5zV00nb+E2pGaMOIuRcEZP5JWf/EPlOrzxBkABqwXqtxGe3COs9pfhs0Ii /HWg== X-Gm-Message-State: ANoB5pl5G42tii4Yv9smZqJxiQsbRimn7Js/FCuH18BEUnU4HgVlnli+ s1c6iezHQxvxtlXK2EdhDW2kVrULIEbgOaU/1XG4hmN3bLCaQr56XoUJy8/mfW4OKnFiRviPNLU E2cLdnZ1G4pOLfTbeYY6K8wirOLcAabc= X-Received: by 2002:a17:906:2342:b0:78d:9e77:1f8c with SMTP id m2-20020a170906234200b0078d9e771f8cmr1540111eja.236.1669642785704; Mon, 28 Nov 2022 05:39:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf7dWKMBxUBrdHelQvYOj1bMkheA66yka6QpMYrG3CEmG3X+SJ/LP8EaRPrscvhj625FBMYiVB1zDC1XMIw6824= X-Received: by 2002:a17:906:2342:b0:78d:9e77:1f8c with SMTP id m2-20020a170906234200b0078d9e771f8cmr1540090eja.236.1669642785444; Mon, 28 Nov 2022 05:39:45 -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 13:39:34 +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="00000000000020e92005ee880156" X-Spam-Status: No, score=-6.6 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: --00000000000020e92005ee880156 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 28 Nov 2022 at 10:08, Jonathan Wakely wrote: > > > 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. > 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). --00000000000020e92005ee880156--