I disabled these tests for C++17 in r7-2679-gc42966921a2897 due to
ambiguous string conversions in __gnu_pbds::test::basic_type. I think
those ambiguous conversions were due to LWG 2946, so would have gone
away with r8-3329-g4cf5930fdc5765 (fixing PR libstdc++/79162).
In any case, the tests all compile as C++17 now so let's re-enable them.
libstdc++-v3/ChangeLog:
* testsuite/ext/pb_ds/regression/hash_map_rand.cc: Remove c++17
target selector.
* testsuite/ext/pb_ds/regression/hash_set_rand.cc: Likewise.
* testsuite/ext/pb_ds/regression/list_update_map_rand.cc:
Likewise.
* testsuite/ext/pb_ds/regression/list_update_set_rand.cc:
Likewise.
* testsuite/ext/pb_ds/regression/priority_queue_rand.cc:
Likewise.
* testsuite/ext/pb_ds/regression/tree_map_rand.cc: Likewise.
* testsuite/ext/pb_ds/regression/tree_set_rand.cc: Likewise.
* testsuite/ext/pb_ds/regression/trie_map_rand.cc: Likewise.
* testsuite/ext/pb_ds/regression/trie_set_rand.cc: Likewise.
---
Tested x86_64-linux. Pushed to trunk.
libstdc++-v3/testsuite/ext/pb_ds/regression/hash_map_rand.cc | 2 +-
libstdc++-v3/testsuite/ext/pb_ds/regression/hash_set_rand.cc | 2 +-
.../testsuite/ext/pb_ds/regression/list_update_map_rand.cc | 2 +-
.../testsuite/ext/pb_ds/regression/list_update_set_rand.cc | 2 +-
.../testsuite/ext/pb_ds/regression/priority_queue_rand.cc | 2 +-
libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand.cc | 2 +-
libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand.cc | 2 +-
libstdc++-v3/testsuite/ext/pb_ds/regression/trie_map_rand.cc | 2 +-
libstdc++-v3/testsuite/ext/pb_ds/regression/trie_set_rand.cc | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_map_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_map_rand.cc
index 2dbbedf4ad86..3c57b90c30f6 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_map_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
// This can take long on simulators, timing out the test.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_set_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_set_rand.cc
index ba3f826ad893..97f6da4a5747 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_set_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_set_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
// This can take long on simulators, timing out the test.
diff --git
a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_map_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_map_rand.cc
index c8419ced2110..b2cd39e2c09a 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_map_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
diff --git
a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_set_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_set_rand.cc
index 28524f05bddb..2da62fb102b8 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_set_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_set_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
index 60d20fc4eab2..0634a99b0bd1 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
// This can take long on simulators, timing out the test.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand.cc
index 5aa175774695..d3794a12857e 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
// This can take long on simulators, timing out the test.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand.cc
index d3b25330117c..9b9796547d19 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
// This can take long on simulators, timing out the test.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_map_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_map_rand.cc
index bbda2a29d78e..f9e931000465 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_map_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
// This can take long on simulators, timing out the test.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_set_rand.cc
b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_set_rand.cc
index ce595b87e3ad..bbd52ba65392 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_set_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_set_rand.cc
@@ -1,5 +1,5 @@
// __gnu_pbds::test::basic_type has ambiguous string conversions in C++17
-// { dg-do run { target { ! c++17 } } }
+// { dg-do run }
// { dg-require-time "" }
// { dg-require-cstdint "" }
// This can take long on simulators, timing out the test.
--
2.55.0
