Fix versioned namespace test failures

Message ID a652bd43-bf3b-639d-1739-5e48d6a20330@gmail.com
State New
Headers show
Series
  • Fix versioned namespace test failures
Related show

Commit Message

François Dumont Dec. 20, 2019, 1:25 p.m.
Comitted as trivial.

After this I only have 1 failure left specific to versioned namespace in 
pretty printers 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.

François

Patch

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<int.>" "" { target *-*-* } 0 }
-// { dg-error "_Compare = std::allocator<int>" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__8::)?less<int.>" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__8::)?allocator<int>" "" { 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<int.>" "" { target *-*-* } 0 }
-// { dg-error "_Compare = std::allocator<int>" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__8::)?less<int.>" "" { target *-*-* } 0 }
+// { dg-error "_Compare = std::(__8::)?allocator<int>" "" { 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 <stop_token>