| Message ID | 20170114115720.GA24952@redhat.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/libstdc++-v3/testsuite/23_containers/array/specialized_algorithms/swap_cxx17.cc b/libstdc++-v3/testsuite/23_containers/array/specialized_algorithms/swap_cxx17.cc index 746e69f..60d7d4c 100644 --- a/libstdc++-v3/testsuite/23_containers/array/specialized_algorithms/swap_cxx17.cc +++ b/libstdc++-v3/testsuite/23_containers/array/specialized_algorithms/swap_cxx17.cc @@ -1,5 +1,6 @@ // { dg-options "-std=gnu++17" } // { dg-do compile } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2016-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc index 0976100..507a708 100644 --- a/libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc +++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc @@ -16,6 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <map> #include <algorithm> diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc index 61d4634..48c17eb 100644 --- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc +++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc @@ -1,4 +1,5 @@ // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2015-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/try_emplace/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/try_emplace/1.cc index 6b7fdd2..e4c883c 100644 --- a/libstdc++-v3/testsuite/23_containers/map/modifiers/try_emplace/1.cc +++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/try_emplace/1.cc @@ -1,4 +1,5 @@ // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2015-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/extract.cc index 260e97b..ec1c7f4 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/extract.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/extract.cc @@ -16,6 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <map> #include <algorithm> diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/extract.cc index f1cbbe4..dbb2cf4 100644 --- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/extract.cc +++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/extract.cc @@ -16,6 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <set> #include <algorithm> diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc index 9da2a57..c56767a 100644 --- a/libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc +++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc @@ -16,6 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <set> #include <algorithm> diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc index 4cbfa6e..ad87c70 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc @@ -16,6 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <unordered_map> #include <testsuite_hooks.h> diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/extract.cc index 7319924..d19435d 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/extract.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/extract.cc @@ -16,6 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <unordered_map> #include <testsuite_hooks.h> diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/extract.cc index 630eee6..6b25f33 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/extract.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/extract.cc @@ -16,6 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <unordered_set> #include <testsuite_hooks.h> diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc index 907a9ad..6f77a94 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc @@ -16,6 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++17" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <unordered_set> #include <testsuite_hooks.h> diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert_vs_emplace.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert_vs_emplace.cc index 187e433..ffa1986 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert_vs_emplace.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert_vs_emplace.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // The class X and test code is by by Howard Hinnant and used under a // Creative Commons Attribution 4.0 International License. diff --git a/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc index fb8cea9..bff49c0 100644 --- a/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc +++ b/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc @@ -17,6 +17,7 @@ // { dg-options "-D_GLIBCXX_DEBUG" } // { dg-do run { target c++11 } } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <algorithm> #include <functional> diff --git a/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc index 959abed..10489d9 100644 --- a/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc +++ b/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc @@ -17,6 +17,7 @@ // { dg-options "-D_GLIBCXX_DEBUG" } // { dg-do run { target c++11 } } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <algorithm> #include <functional> diff --git a/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/71545.cc b/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/71545.cc index c8a4eab..14a209f 100644 --- a/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/71545.cc +++ b/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/71545.cc @@ -17,6 +17,7 @@ // { dg-options "-D_GLIBCXX_DEBUG" } // { dg-do link { target c++11 } } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <algorithm> diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc index cf1ea56..3c63e50 100644 --- a/libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc +++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc @@ -17,6 +17,7 @@ // { dg-options "-D_GLIBCXX_DEBUG" } // { dg-do run { target c++11 } } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <algorithm> #include <functional> diff --git a/libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc index 71b17ac..6cb9608 100644 --- a/libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc +++ b/libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc @@ -17,6 +17,7 @@ // { dg-options "-D_GLIBCXX_DEBUG" } // { dg-do run { target c++11 } } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } #include <algorithm> #include <functional> diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc index 6d05ed5..cee2bb3 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++11 } } // { dg-options "-g -O0" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2011-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc index 1df6b65..d31ae7e 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc @@ -1,5 +1,6 @@ // { dg-options "-g -O0 -std=gnu++1z" } // { dg-do run { target c++1z } } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2014-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug.cc index 7bcb5fc..89d0c24 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug.cc @@ -1,5 +1,6 @@ // { dg-do run } // { dg-options "-g -O0 -std=gnu++98" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2011-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug_cxx11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug_cxx11.cc index 4fc3f04..1413bda 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug_cxx11.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug_cxx11.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++11 } } // { dg-options "-g -O0" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2016-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc index cc20253..a903713 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/libfundts.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++14 } } // { dg-options "-g -O0" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2014-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc index b47e0e7..618556a 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc @@ -2,6 +2,7 @@ // { dg-do run } // { dg-options "-g -O0 -std=gnu++98" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2011-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc index b1c6c7a..e8d1190 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc @@ -2,6 +2,7 @@ // { dg-do run { target c++11 } } // { dg-options "-g -O0" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2011-2017 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/whatis.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/whatis.cc index 7a55bb7..8d71531 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/whatis.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/whatis.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++11 } } // { dg-options "-g -O0" } +// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PROFILE" } } // Copyright (C) 2011-2017 Free Software Foundation, Inc. //
This fixes all failures for 'make check-profile', which are either due to tests that use Debug Mode (which can't be combined with Profile Mode) or which rely on new C++17 features that the Profile Mode containers don't support. As Profile Mode has been deprecated for GCC 7 we're unlikely to add those new features, and can just skip the tests. * testsuite/23_containers/array/specialized_algorithms/swap_cxx17.cc: Skip test when -D_GLIBCXX_PROFILE mode is included in options. * testsuite/23_containers/map/modifiers/extract.cc: Likewise. * testsuite/23_containers/map/modifiers/insert_or_assign/1.cc: Likewise. * testsuite/23_containers/map/modifiers/try_emplace/1.cc: Likewise. * testsuite/23_containers/multimap/modifiers/extract.cc: Likewise. * testsuite/23_containers/multiset/modifiers/extract.cc: Likewise. * testsuite/23_containers/set/modifiers/extract.cc: Likewise. * testsuite/23_containers/unordered_map/modifiers/extract.cc: Likewise. * testsuite/23_containers/unordered_multimap/modifiers/extract.cc:: Likewise. * testsuite/23_containers/unordered_multiset/modifiers/extract.cc:: Likewise. * testsuite/23_containers/unordered_set/modifiers/extract.cc: Likewise. * testsuite/23_containers/vector/modifiers/insert_vs_emplace.cc: Likewise. * testsuite/25_algorithms/binary_search/partitioned.cc: Likewise. * testsuite/25_algorithms/equal_range/partitioned.cc: Likewise. * testsuite/25_algorithms/lexicographical_compare/71545.cc: Likewise. * testsuite/25_algorithms/lower_bound/partitioned.cc: Likewise. * testsuite/25_algorithms/upper_bound/partitioned.cc: Likewise. * testsuite/libstdc++-prettyprinters/cxx11.cc: Likewise. * testsuite/libstdc++-prettyprinters/cxx17.cc: Likewise. * testsuite/libstdc++-prettyprinters/debug.cc: Likewise. * testsuite/libstdc++-prettyprinters/debug_cxx11.cc: Likewise. * testsuite/libstdc++-prettyprinters/libfundts.cc: Likewise. * testsuite/libstdc++-prettyprinters/simple.cc: Likewise. * testsuite/libstdc++-prettyprinters/simple11.cc: Likewise. * testsuite/libstdc++-prettyprinters/whatis.cc: Likewise. Tested powerpc64le-linux, commmitted to trunk. commit 4c1ae763901fcd7197ff53793333c1272e3281c1 Author: Jonathan Wakely <jwakely@redhat.com> Date: Fri Jan 13 18:55:43 2017 +0000 Skip tests that are incompatible with Profile Mode * testsuite/23_containers/array/specialized_algorithms/swap_cxx17.cc: Skip test when -D_GLIBCXX_PROFILE mode is included in options. * testsuite/23_containers/map/modifiers/extract.cc: Likewise. * testsuite/23_containers/map/modifiers/insert_or_assign/1.cc: Likewise. * testsuite/23_containers/map/modifiers/try_emplace/1.cc: Likewise. * testsuite/23_containers/multimap/modifiers/extract.cc: Likewise. * testsuite/23_containers/multiset/modifiers/extract.cc: Likewise. * testsuite/23_containers/set/modifiers/extract.cc: Likewise. * testsuite/23_containers/unordered_map/modifiers/extract.cc: Likewise. * testsuite/23_containers/unordered_multimap/modifiers/extract.cc:: Likewise. * testsuite/23_containers/unordered_multiset/modifiers/extract.cc:: Likewise. * testsuite/23_containers/unordered_set/modifiers/extract.cc: Likewise. * testsuite/23_containers/vector/modifiers/insert_vs_emplace.cc: Likewise. * testsuite/25_algorithms/binary_search/partitioned.cc: Likewise. * testsuite/25_algorithms/equal_range/partitioned.cc: Likewise. * testsuite/25_algorithms/lexicographical_compare/71545.cc: Likewise. * testsuite/25_algorithms/lower_bound/partitioned.cc: Likewise. * testsuite/25_algorithms/upper_bound/partitioned.cc: Likewise. * testsuite/libstdc++-prettyprinters/cxx11.cc: Likewise. * testsuite/libstdc++-prettyprinters/cxx17.cc: Likewise. * testsuite/libstdc++-prettyprinters/debug.cc: Likewise. * testsuite/libstdc++-prettyprinters/debug_cxx11.cc: Likewise. * testsuite/libstdc++-prettyprinters/libfundts.cc: Likewise. * testsuite/libstdc++-prettyprinters/simple.cc: Likewise. * testsuite/libstdc++-prettyprinters/simple11.cc: Likewise. * testsuite/libstdc++-prettyprinters/whatis.cc: Likewise.