diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2018-10-19 22:49:19 +0100 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-10-19 22:49:19 +0100 |
commit | 88412b71eefd5a445989f5211763c9498b854e1f (patch) | |
tree | 804711eb39712bbf3829e56e362c280c3e003365 | |
parent | 92646d25778952a1fd24fa9a6f407cd421606195 (diff) | |
download | gcc-88412b71eefd5a445989f5211763c9498b854e1f.zip gcc-88412b71eefd5a445989f5211763c9498b854e1f.tar.gz gcc-88412b71eefd5a445989f5211763c9498b854e1f.tar.bz2 |
Remove duplicate tests
These tests originally existed to check the containers in C++11 mode,
when the default was C++98 mode. Now that the default is C++14 (and we
run most tests for all modes) it serves no purpose to have two copies of
the tests when neither is explicitly using -std=gnu++98 anyway.
* testsuite/23_containers/list/requirements/explicit_instantiation/
5_c++0x.cc: Remove redundant test that is functionally identical to
the 5.cc test.
* testsuite/23_containers/map/requirements/explicit_instantiation/
5_c++0x.cc: Likewise.
* testsuite/23_containers/multimap/requirements/explicit_instantiation/
5_c++0x.cc: Likewise.
* testsuite/23_containers/multiset/requirements/explicit_instantiation/
5_c++0x.cc: Likewise.
* testsuite/23_containers/set/requirements/explicit_instantiation/
5_c++0x.cc: Likewise.
From-SVN: r265329
6 files changed, 12 insertions, 148 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c307c1f..ee7823a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,17 @@ 2018-10-19 Jonathan Wakely <jwakely@redhat.com> + * testsuite/23_containers/list/requirements/explicit_instantiation/ + 5_c++0x.cc: Remove redundant test that is functionally identical to + the 5.cc test. + * testsuite/23_containers/map/requirements/explicit_instantiation/ + 5_c++0x.cc: Likewise. + * testsuite/23_containers/multimap/requirements/explicit_instantiation/ + 5_c++0x.cc: Likewise. + * testsuite/23_containers/multiset/requirements/explicit_instantiation/ + 5_c++0x.cc: Likewise. + * testsuite/23_containers/set/requirements/explicit_instantiation/ + 5_c++0x.cc: Likewise. + * include/bits/regex_executor.tcc (_Backref_matcher::_M_apply): Use _GLIBCXX_STD_A to refer to normal mode algorithms. * testsuite/28_regex/headers/regex/parallel_mode.cc: New test. diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/5_c++0x.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/5_c++0x.cc deleted file mode 100644 index e93a8c7..0000000 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/5_c++0x.cc +++ /dev/null @@ -1,28 +0,0 @@ - -// Copyright (C) 2011-2018 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -// This file tests explicit instantiation of library containers - -#include <list> -#include <testsuite_allocator.h> - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::list<int, __gnu_test::ExplicitConsAlloc<int>>; -template class std::list<int, __gnu_test::ExplicitConsAlloc<char>>; diff --git a/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/5_c++0x.cc b/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/5_c++0x.cc deleted file mode 100644 index 88bd861..0000000 --- a/libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/5_c++0x.cc +++ /dev/null @@ -1,30 +0,0 @@ - -// Copyright (C) 2011-2018 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -// This file tests explicit instantiation of library containers - -#include <map> -#include <testsuite_allocator.h> - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::map<int, int, std::less<int>, - __gnu_test::ExplicitConsAlloc<int>>; -template class std::map<int, int, std::less<int>, - __gnu_test::ExplicitConsAlloc<char>>; diff --git a/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5_c++0x.cc b/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5_c++0x.cc deleted file mode 100644 index 9ba12e1..0000000 --- a/libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5_c++0x.cc +++ /dev/null @@ -1,30 +0,0 @@ - -// Copyright (C) 2011-2018 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -// This file tests explicit instantiation of library containers - -#include <map> -#include <testsuite_allocator.h> - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::multimap<int, int, std::less<int>, - __gnu_test::ExplicitConsAlloc<int>>; -template class std::multimap<int, int, std::less<int>, - __gnu_test::ExplicitConsAlloc<char>>; diff --git a/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/5_c++0x.cc b/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/5_c++0x.cc deleted file mode 100644 index 8ec73ba..0000000 --- a/libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/5_c++0x.cc +++ /dev/null @@ -1,30 +0,0 @@ - -// Copyright (C) 2011-2018 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -// This file tests explicit instantiation of library containers - -#include <set> -#include <testsuite_allocator.h> - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::multiset<int, std::less<int>, - __gnu_test::ExplicitConsAlloc<int>>; -template class std::multiset<int, std::less<int>, - __gnu_test::ExplicitConsAlloc<char>>; diff --git a/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/5_c++0x.cc b/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/5_c++0x.cc deleted file mode 100644 index 52993bd..0000000 --- a/libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/5_c++0x.cc +++ /dev/null @@ -1,30 +0,0 @@ - -// Copyright (C) 2011-2018 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -// This file tests explicit instantiation of library containers - -#include <set> -#include <testsuite_allocator.h> - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::set<int, std::less<int>, - __gnu_test::ExplicitConsAlloc<int>>; -template class std::set<int, std::less<int>, - __gnu_test::ExplicitConsAlloc<char>>; |