From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 59414385703F; Mon, 28 Nov 2022 15:19:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 59414385703F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669648759; bh=BQ7VO8apHKKWWTLl/DdEry3f6UJHu/EKtqsYlFeBpkw=; h=From:To:Subject:Date:From; b=mN7sBuwpK5AEGdpZaolQeHmgeVR5VxW+Y3XUQfHmpJafM/IB31G0Ghc8D6Bk7SThR jTIhFpZpuCqBXXpP9PNCo/AiIJobvpH1omSx21CxSrpKwjjPQaAImDai6RiSztJoGm 1Gjs2t7EJM8hynfsqy+8OlntxfekgTie1WTh/ZLo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-4365] libstdc++: Prune versioned namespace from testsuite output X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: a64775a0edd46980036b757041f0c065ed9f8d22 X-Git-Newrev: 8a47132063f84622e2356cff782566eb8a9470ff Message-Id: <20221128151919.59414385703F@sourceware.org> Date: Mon, 28 Nov 2022 15:19:19 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8a47132063f84622e2356cff782566eb8a9470ff commit r13-4365-g8a47132063f84622e2356cff782566eb8a9470ff Author: Jonathan Wakely Date: Mon Nov 28 11:18:07 2022 +0000 libstdc++: Prune versioned namespace from testsuite output This means we don't need to use "(__8::)?" in dg-prune-output directives. libstdc++-v3/ChangeLog: * testsuite/20_util/is_complete_or_unbounded/memoization_neg.cc: Simplify dg-prune-output pattern. * testsuite/lib/prune.exp (libstdc++-dg-prune): Prune "::__8". Diff: --- .../testsuite/20_util/is_complete_or_unbounded/memoization_neg.cc | 2 +- libstdc++-v3/testsuite/lib/prune.exp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/20_util/is_complete_or_unbounded/memoization_neg.cc b/libstdc++-v3/testsuite/20_util/is_complete_or_unbounded/memoization_neg.cc index bc66c13feee..fc0b70b319c 100644 --- a/libstdc++-v3/testsuite/20_util/is_complete_or_unbounded/memoization_neg.cc +++ b/libstdc++-v3/testsuite/20_util/is_complete_or_unbounded/memoization_neg.cc @@ -1,6 +1,6 @@ // { dg-do compile { target c++11 } } // { dg-prune-output "must be a complete" } -// { dg-prune-output "'value' is not a member of 'std::(__8::)?is_move_cons" } +// { dg-prune-output "'value' is not a member of 'std::is_move_cons" } // { dg-prune-output "invalid use of incomplete type" } // Copyright (C) 2019-2022 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/lib/prune.exp b/libstdc++-v3/testsuite/lib/prune.exp index 6d0b77a8ccd..74842ae680c 100644 --- 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