From bb10fcfe1fc4a12775f6e37303745ccfd4e39f49 Mon Sep 17 00:00:00 2001 From: redi Date: Fri, 19 Oct 2018 21:49:19 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@265329 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 12 +++++++++ .../requirements/explicit_instantiation/5_c++0x.cc | 28 -------------------- .../requirements/explicit_instantiation/5_c++0x.cc | 30 ---------------------- .../requirements/explicit_instantiation/5_c++0x.cc | 30 ---------------------- .../requirements/explicit_instantiation/5_c++0x.cc | 30 ---------------------- .../requirements/explicit_instantiation/5_c++0x.cc | 30 ---------------------- 6 files changed, 12 insertions(+), 148 deletions(-) delete mode 100644 libstdc++-v3/testsuite/23_containers/list/requirements/explicit_instantiation/5_c++0x.cc delete mode 100644 libstdc++-v3/testsuite/23_containers/map/requirements/explicit_instantiation/5_c++0x.cc delete mode 100644 libstdc++-v3/testsuite/23_containers/multimap/requirements/explicit_instantiation/5_c++0x.cc delete mode 100644 libstdc++-v3/testsuite/23_containers/multiset/requirements/explicit_instantiation/5_c++0x.cc delete mode 100644 libstdc++-v3/testsuite/23_containers/set/requirements/explicit_instantiation/5_c++0x.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c307c1ff7ab..ee7823ad8f4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,17 @@ 2018-10-19 Jonathan Wakely + * 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 e93a8c75707..00000000000 --- 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 -// . - -// This file tests explicit instantiation of library containers - -#include -#include - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::list>; -template class std::list>; 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 88bd861f631..00000000000 --- 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 -// . - -// This file tests explicit instantiation of library containers - -#include -#include - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::map, - __gnu_test::ExplicitConsAlloc>; -template class std::map, - __gnu_test::ExplicitConsAlloc>; 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 9ba12e1600b..00000000000 --- 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 -// . - -// This file tests explicit instantiation of library containers - -#include -#include - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::multimap, - __gnu_test::ExplicitConsAlloc>; -template class std::multimap, - __gnu_test::ExplicitConsAlloc>; 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 8ec73ba0f06..00000000000 --- 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 -// . - -// This file tests explicit instantiation of library containers - -#include -#include - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::multiset, - __gnu_test::ExplicitConsAlloc>; -template class std::multiset, - __gnu_test::ExplicitConsAlloc>; 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 52993bda9c0..00000000000 --- 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 -// . - -// This file tests explicit instantiation of library containers - -#include -#include - -// { dg-do compile { target c++11 } } - -// libstdc++/50118 -template class std::set, - __gnu_test::ExplicitConsAlloc>; -template class std::set, - __gnu_test::ExplicitConsAlloc>; -- 2.11.4.GIT