The extension that allows implicitly rebinding a container's allocator
is not allowed when _GLIBCXX_CONCEPT_CHECKS is defined, so skip the
tests for that extension.
Signed-off-by: Jonathan Wakely <jwak...@redhat.com>
libstdc++-v3/ChangeLog:
*
testsuite/23_containers/deque/requirements/explicit_instantiation/3.cc:
Do not test implicit allocator rebinding when _GLIBCXX_CONCEPT_CHECKS
is defined.
*
testsuite/23_containers/forward_list/requirements/explicit_instantiation/3.cc:
Likewise.
* testsuite/23_containers/list/requirements/explicit_instantiation/3.cc:
Likewise.
* testsuite/23_containers/list/requirements/explicit_instantiation/5.cc:
Likewise.
* testsuite/23_containers/map/requirements/explicit_instantiation/3.cc:
Likewise.
* testsuite/23_containers/map/requirements/explicit_instantiation/5.cc:
Likewise.
*
testsuite/23_containers/multimap/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/multimap/requirements/explicit_instantiation/5.cc:
Likewise.
*
testsuite/23_containers/multiset/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/multiset/requirements/explicit_instantiation/5.cc:
Likewise.
* testsuite/23_containers/set/requirements/explicit_instantiation/3.cc:
Likewise.
* testsuite/23_containers/set/requirements/explicit_instantiation/5.cc:
Likewise.
*
testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/unordered_multiset/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/unordered_set/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/vector/ext_pointer/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/vector/requirements/explicit_instantiation/3.cc:
Likewise.
Tested x86_64-linux. Committed to trunk.
commit b701f46ea6d651aff8dbd267c29213253045e2b6
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Fri Sep 24 14:23:36 2021
libstdc++: Skip tests that fail with _GLIBCXX_CONCEPT_CHECKS
The extension that allows implicitly rebinding a container's allocator
is not allowed when _GLIBCXX_CONCEPT_CHECKS is defined, so skip the
tests for that extension.
Signed-off-by: Jonathan Wakely <jwak...@redhat.com>
libstdc++-v3/ChangeLog:
*
testsuite/23_containers/deque/requirements/explicit_instantiation/3.cc:
Do not test implicit allocator rebinding when
_GLIBCXX_CONCEPT_CHECKS
is defined.
*
testsuite/23_containers/forward_list/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/list/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/list/requirements/explicit_instantiation/5.cc:
Likewise.
*
testsuite/23_containers/map/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/map/requirements/explicit_instantiation/5.cc:
Likewise.
*
testsuite/23_containers/multimap/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/multimap/requirements/explicit_instantiation/5.cc:
Likewise.
*
testsuite/23_containers/multiset/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/multiset/requirements/explicit_instantiation/5.cc:
Likewise.
*
testsuite/23_containers/set/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/set/requirements/explicit_instantiation/5.cc:
Likewise.
*
testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/unordered_multiset/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/unordered_set/requirements/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/vector/ext_pointer/explicit_instantiation/3.cc:
Likewise.
*
testsuite/23_containers/vector/requirements/explicit_instantiation/3.cc:
Likewise.
diff --git
a/libstdc++-v3/testsuite/23_containers/deque/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/deque/requirements/explicit_instantiation/3.cc
index 0cbedf4693b..2a23eaa3f17 100644
---
a/libstdc++-v3/testsuite/23_containers/deque/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/deque/requirements/explicit_instantiation/3.cc
@@ -22,7 +22,7 @@
// { dg-do compile }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::deque<int, std::allocator<char> >;
diff --git
a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/explicit_instantiation/3.cc
index 58ea6b1d33b..60dd1a86c65 100644
---
a/libstdc++-v3/testsuite/23_containers/forward_list/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/forward_list/requirements/explicit_instantiation/3.cc
@@ -23,7 +23,7 @@
// { dg-do compile { target c++11 } }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::forward_list<int, std::allocator<char> >;
diff --git
a/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/3.cc
index 735ae1184a7..f4e42ff575f 100644
---
a/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/3.cc
@@ -22,7 +22,7 @@
// { dg-do compile }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::list<int, std::allocator<char> >;
diff --git
a/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/5.cc
b/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/5.cc
index 24219bc5305..48443243030 100644
---
a/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/5.cc
+++
b/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/5.cc
@@ -24,6 +24,7 @@
// libstdc++/50118
template class std::list<int, __gnu_test::ExplicitConsAlloc<int> >;
-#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L
+#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L \
+ && !defined _GLIBCXX_CONCEPT_CHECKS
template class std::list<int, __gnu_test::ExplicitConsAlloc<char> >;
#endif
diff --git
a/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/3.cc
index c281f1f7c1f..f0d5e8aa773 100644
---
a/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/3.cc
@@ -22,7 +22,7 @@
// { dg-do compile }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::map<int, double, std::less<int>, std::allocator<char> >;
diff --git
a/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/5.cc
b/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/5.cc
index 17647222209..62d48682fe9 100644
---
a/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/5.cc
+++
b/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/5.cc
@@ -27,7 +27,8 @@ using __gnu_test::ExplicitConsAlloc;
// libstdc++/50118
template class std::map<int, int, std::less<int>,
ExplicitConsAlloc<std::pair<const int, int> > >;
-#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L
+#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L \
+ && !defined _GLIBCXX_CONCEPT_CHECKS
template class std::map<int, int, std::less<int>,
ExplicitConsAlloc<char> >;
#endif
diff --git
a/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/3.cc
index 083061cdbad..3c7c0af7489 100644
---
a/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/3.cc
@@ -22,7 +22,7 @@
// { dg-do compile }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::multimap<int, double, std::less<int>, std::allocator<char>
>;
diff --git
a/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5.cc
b/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5.cc
index d0b9209743e..87f5ae4de5e 100644
---
a/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5.cc
+++
b/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5.cc
@@ -27,7 +27,8 @@ using __gnu_test::ExplicitConsAlloc;
// libstdc++/50118
template class std::multimap<int, int, std::less<int>,
ExplicitConsAlloc<std::pair<const int, int> > >;
-#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L
+#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L \
+ && !defined _GLIBCXX_CONCEPT_CHECKS
template class std::multimap<int, int, std::less<int>,
ExplicitConsAlloc<char> >;
#endif
diff --git
a/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/3.cc
index 1e6dbf90c1c..19d64c28148 100644
---
a/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/3.cc
@@ -22,7 +22,7 @@
// { dg-do compile }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::multiset<int, std::less<int>, std::allocator<char> >;
diff --git
a/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/5.cc
b/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/5.cc
index b66d59dd2fa..00f7fde7afc 100644
---
a/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/5.cc
+++
b/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/5.cc
@@ -25,7 +25,8 @@
// libstdc++/50118
template class std::multiset<int, std::less<int>,
__gnu_test::ExplicitConsAlloc<int> >;
-#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L
+#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L \
+ && !defined _GLIBCXX_CONCEPT_CHECKS
template class std::multiset<int, std::less<int>,
__gnu_test::ExplicitConsAlloc<char> >;
#endif
diff --git
a/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/3.cc
index b55d5189286..17c217719cd 100644
---
a/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/3.cc
@@ -22,7 +22,7 @@
// { dg-do compile }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::set<int, std::less<int>, std::allocator<char> >;
diff --git
a/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/5.cc
b/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/5.cc
index 29e3ec3f8cc..d224e85fbde 100644
---
a/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/5.cc
+++
b/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/5.cc
@@ -25,7 +25,8 @@
// libstdc++/50118
template class std::set<int, std::less<int>,
__gnu_test::ExplicitConsAlloc<int> >;
-#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L
+#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L \
+ && !defined _GLIBCXX_CONCEPT_CHECKS
template class std::set<int, std::less<int>,
__gnu_test::ExplicitConsAlloc<char> >;
#endif
diff --git
a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc
index 7985f7ad83d..e9c936760ce 100644
---
a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc
@@ -1,6 +1,6 @@
// { dg-do compile { target c++11 } }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// Copyright (C) 2007-2021 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc
index 3d39b88937b..35a47faf746 100644
---
a/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc
@@ -1,6 +1,6 @@
// { dg-do compile { target c++11 } }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// Copyright (C) 2007-2021 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/23_containers/unordered_multiset/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/unordered_multiset/requirements/explicit_instantiation/3.cc
index 4c6c9842a5f..3effea3dc5e 100644
---
a/libstdc++-v3/testsuite/23_containers/unordered_multiset/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/unordered_multiset/requirements/explicit_instantiation/3.cc
@@ -1,6 +1,6 @@
// { dg-do compile { target c++11 } }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// Copyright (C) 2007-2021 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/explicit_instantiation/3.cc
index da475392de9..bd868586f2d 100644
---
a/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/unordered_set/requirements/explicit_instantiation/3.cc
@@ -1,6 +1,6 @@
// { dg-do compile { target c++11 } }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// Copyright (C) 2007-2021 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/explicit_instantiation/3.cc
index 1614989cb9a..0dcfbd6afb2 100644
---
a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/explicit_instantiation/3.cc
@@ -25,7 +25,7 @@
// { dg-do compile }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::vector<int, __gnu_cxx::_ExtPtr_allocator<char> >;
diff --git
a/libstdc++-v3/testsuite/23_containers/vector/requirements/explicit_instantiation/3.cc
b/libstdc++-v3/testsuite/23_containers/vector/requirements/explicit_instantiation/3.cc
index 8c96e9a0c8d..39316ee9b4c 100644
---
a/libstdc++-v3/testsuite/23_containers/vector/requirements/explicit_instantiation/3.cc
+++
b/libstdc++-v3/testsuite/23_containers/vector/requirements/explicit_instantiation/3.cc
@@ -22,7 +22,7 @@
// { dg-do compile }
// The extension that implicitly rebinds allocators is in gnu++98/11/14/17 only
-// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*" } }
+// { dg-skip-if "" { *-*-* } { "-std=c++*" "-std=gnu++2*"
"-D_GLIBCXX_CONCEPT_CHECKS*" } }
// libstdc++/21770
template class std::vector<int, std::allocator<char> >;
