diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2021-09-24 14:23:36 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2021-09-28 20:22:51 +0100 |
commit | b701f46ea6d651aff8dbd267c29213253045e2b6 (patch) | |
tree | 50d6a2525c1f9b4fd695d469b30cd967d21e4d22 /libstdc++-v3/testsuite/23_containers/multimap/requirements | |
parent | afffc96a5259ba4e3f3cca154dc5ea32a496875e (diff) | |
download | gcc-b701f46ea6d651aff8dbd267c29213253045e2b6.tar.gz |
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 <jwakely@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.
Diffstat (limited to 'libstdc++-v3/testsuite/23_containers/multimap/requirements')
-rw-r--r-- | libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/3.cc | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5.cc | 3 |
2 files changed, 3 insertions, 2 deletions
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 |