From 33bd8e5e22182ed84a685fa27c8fc04585da5355 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Fri, 20 Dec 2019 13:24:52 +0000 Subject: [PATCH] libstdc++: Fix versioned namespace tests * testsuite/23_containers/map/48101_neg.cc: Add versioned namespace pattern to tested error message. * testsuite/23_containers/multimap/48101_neg.cc: Likewise. * testsuite/30_threads/headers/stop_token/synopsis.cc: Add dg-require-normal-namepace. From-SVN: r279641 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/testsuite/23_containers/map/48101_neg.cc | 4 ++-- libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc | 4 ++-- .../testsuite/30_threads/headers/stop_token/synopsis.cc | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 82b2bbfed3b..ceebebcc1fd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2019-12-20 François Dumont + * testsuite/23_containers/map/48101_neg.cc: Add versioned namespace + pattern to tested error message. + * testsuite/23_containers/multimap/48101_neg.cc: Likewise. + * testsuite/30_threads/headers/stop_token/synopsis.cc: Add + dg-require-normal-namepace. + * python/libstdcxx/v6/printers.py (lookup_node_type): Remove redundant call to lookup_node_type. * testsuite/libstdc++-prettyprinters/80276.cc: Define diff --git a/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc index 8a7429c85a8..ed80ba44446 100644 --- a/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/map/48101_neg.cc @@ -29,8 +29,8 @@ test01() c2.find(2); // { dg-error "here" } } -// { dg-error "_Compare = std::less" "" { target *-*-* } 0 } -// { dg-error "_Compare = std::allocator" "" { target *-*-* } 0 } +// { dg-error "_Compare = std::(__8::)?less" "" { target *-*-* } 0 } +// { dg-error "_Compare = std::(__8::)?allocator" "" { target *-*-* } 0 } // { dg-error "comparison object must be invocable" "" { target *-*-* } 0 } // { dg-prune-output "no match for call" } // { dg-prune-output "invalid conversion" } diff --git a/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc index 7bd56cc9c73..513822cc96f 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/48101_neg.cc @@ -29,8 +29,8 @@ test01() c2.find(2); // { dg-error "here" } } -// { dg-error "_Compare = std::less" "" { target *-*-* } 0 } -// { dg-error "_Compare = std::allocator" "" { target *-*-* } 0 } +// { dg-error "_Compare = std::(__8::)?less" "" { target *-*-* } 0 } +// { dg-error "_Compare = std::(__8::)?allocator" "" { target *-*-* } 0 } // { dg-error "comparison object must be invocable" "" { target *-*-* } 0 } // { dg-prune-output "no match for call" } // { dg-prune-output "invalid conversion" } diff --git a/libstdc++-v3/testsuite/30_threads/headers/stop_token/synopsis.cc b/libstdc++-v3/testsuite/30_threads/headers/stop_token/synopsis.cc index b185bc7be39..59b3e772d99 100644 --- a/libstdc++-v3/testsuite/30_threads/headers/stop_token/synopsis.cc +++ b/libstdc++-v3/testsuite/30_threads/headers/stop_token/synopsis.cc @@ -17,6 +17,7 @@ // { dg-options "-std=gnu++2a" } // { dg-do compile { target c++2a } } +// { dg-require-normal-namespace "" } #include -- 2.30.2