diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-11-28 11:18:07 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-11-28 15:03:15 +0000 |
| commit | 8a47132063f84622e2356cff782566eb8a9470ff (patch) | |
| tree | 3d6b13ad92a00951dd244a164ff797379c989be9 /libstdc++-v3 | |
| parent | a64775a0edd46980036b757041f0c065ed9f8d22 (diff) | |
| download | gcc-8a47132063f84622e2356cff782566eb8a9470ff.zip gcc-8a47132063f84622e2356cff782566eb8a9470ff.tar.gz gcc-8a47132063f84622e2356cff782566eb8a9470ff.tar.bz2 | |
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".
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/is_complete_or_unbounded/memoization_neg.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/prune.exp | 2 |
2 files changed, 3 insertions, 1 deletions
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 bc66c13..fc0b70b 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 6d0b77a..74842ae 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 |