diff mbox series

[committed] libstdc++: Prune versioned namespace from testsuite output

Message ID 20221128152015.41760-1-jwakely@redhat.com
State Committed
Commit 8a47132063f84622e2356cff782566eb8a9470ff
Headers
Series [committed] libstdc++: Prune versioned namespace from testsuite output |

Commit Message

Jonathan Wakely Nov. 28, 2022, 3:20 p.m. UTC 
  Tested x86_64-linux. Pushed to trunk.

-- >8 --

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".
---
 .../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 mbox series

Patch

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