| Message ID | 20191001205950.GO9487@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Disable tests that aren't valid in parallel mode | expand |
On 01/10/19 21:59 +0100, Jonathan Wakely wrote: >Tested x86_64-linux (normal and parallel modes), committed to trunk. >commit b11c8f480fe1cd5696ec1a8f0db481c5f45429b8 >Author: Jonathan Wakely <jwakely@redhat.com> >Date: Tue Oct 1 20:31:51 2019 +0100 > > Disable tests that aren't valid in parallel mode > > Tests that depend on debug mode can't be tested in parallel mode. > > * testsuite/17_intro/using_namespace_std_tr1_neg.cc: Skip test for > parallel mode. > * testsuite/20_util/hash/84998.cc: Likewise. > * testsuite/23_containers/deque/types/pmr_typedefs_debug.cc: Likewise. > * testsuite/23_containers/forward_list/pmr_typedefs_debug.cc: Likewise. > * testsuite/23_containers/list/pmr_typedefs_debug.cc: Likewise. > * testsuite/23_containers/map/pmr_typedefs_debug.cc: Likewise. > * testsuite/23_containers/multimap/pmr_typedefs_debug.cc: Likewise. > * testsuite/23_containers/multiset/pmr_typedefs_debug.cc: Likewise. > * testsuite/23_containers/set/pmr_typedefs_debug.cc: Likewise. > * testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc: > Likewise. > * testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc: > Likewise. > * testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc: > Likewise. > * testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc: > Likewise. > * testsuite/23_containers/vector/cons/destructible_debug_neg.cc: > Likewise. > * testsuite/23_containers/vector/types/pmr_typedefs_debug.cc: Likewise. > * testsuite/25_algorithms/binary_search/partitioned.cc: Likewise. > * testsuite/25_algorithms/copy/86658.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. The remaining failures for 'make check-parallel' are all in tests for C++20 constexpr and move-only function objects. We should just document that Parallel Mode only really meets the C++03 requirements. For C++17 there are new parallel algorithms, and once those are able to use OpenMP we should consider deprecating Parallel Mode entirely. This documents the limitation. Committed to trunk.
commit b11c8f480fe1cd5696ec1a8f0db481c5f45429b8
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue Oct 1 20:31:51 2019 +0100
Disable tests that aren't valid in parallel mode
Tests that depend on debug mode can't be tested in parallel mode.
* testsuite/17_intro/using_namespace_std_tr1_neg.cc: Skip test for
parallel mode.
* testsuite/20_util/hash/84998.cc: Likewise.
* testsuite/23_containers/deque/types/pmr_typedefs_debug.cc: Likewise.
* testsuite/23_containers/forward_list/pmr_typedefs_debug.cc: Likewise.
* testsuite/23_containers/list/pmr_typedefs_debug.cc: Likewise.
* testsuite/23_containers/map/pmr_typedefs_debug.cc: Likewise.
* testsuite/23_containers/multimap/pmr_typedefs_debug.cc: Likewise.
* testsuite/23_containers/multiset/pmr_typedefs_debug.cc: Likewise.
* testsuite/23_containers/set/pmr_typedefs_debug.cc: Likewise.
* testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc:
Likewise.
* testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc:
Likewise.
* testsuite/23_containers/vector/cons/destructible_debug_neg.cc:
Likewise.
* testsuite/23_containers/vector/types/pmr_typedefs_debug.cc: Likewise.
* testsuite/25_algorithms/binary_search/partitioned.cc: Likewise.
* testsuite/25_algorithms/copy/86658.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.
diff --git a/libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc b/libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc
index 31242760179..bdc41507424 100644
--- a/libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc
+++ b/libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc
@@ -18,7 +18,7 @@
// <http://www.gnu.org/licenses/>.
// NB: parallel-mode uses TR1 bits...
-#undef _GLIBCXX_PARALLEL
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <algorithm>
#include <array>
diff --git a/libstdc++-v3/testsuite/20_util/hash/84998.cc b/libstdc++-v3/testsuite/20_util/hash/84998.cc
index 1cf57e9073c..b00df223415 100644
--- a/libstdc++-v3/testsuite/20_util/hash/84998.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/84998.cc
@@ -17,6 +17,7 @@
// { dg-options "-D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++11 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
// PR libstdc++/84998
diff --git a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
index ac96584a6e0..9bee219b58f 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/deque>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
index 7df01d530f8..66138ba830c 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/forward_list>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
index d59f8c41d1d..b1bb271aa1c 100644
--- a/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/list>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
index d06673027e5..c959b6957ed 100644
--- a/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/map>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
index 641fe26fdbe..062e9b22c6d 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/map>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
index 2fa4dda70c6..5ac8f986162 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/set>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
index 785986c0673..b705108c5e9 100644
--- a/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/set>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
index 8b3237ed4f6..73c7f338265 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/unordered_map>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
index 50fcf10f565..2328a3e5223 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/unordered_map>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
index 8a77d519adc..a41c23b06e0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/unordered_set>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
index 93546dbb476..c6422dbbfa7 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/unordered_set>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc
index 061bb414f47..daeab2fe26b 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc
@@ -17,6 +17,7 @@
// { dg-options "-D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++11 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc b/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
index 62fb5b674cc..1db6897a9e3 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc
@@ -17,6 +17,7 @@
// { dg-options "-std=gnu++17 -D_GLIBCXX_DEBUG" }
// { dg-do compile { target c++17 } }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <debug/vector>
static_assert(std::is_same_v<
diff --git a/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc
index 43d260ed1c3..14a437c308c 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_PARALLEL" } }
#include <algorithm>
#include <functional>
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/86658.cc b/libstdc++-v3/testsuite/25_algorithms/copy/86658.cc
index 7092c8b0ce1..410985cb5e0 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/86658.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/86658.cc
@@ -17,6 +17,7 @@
// { dg-options "-D_GLIBCXX_DEBUG" }
// { dg-do run }
+// { dg-skip-if "" { *-*-* } { "-D_GLIBCXX_PARALLEL" } }
#include <algorithm>
#include <vector>
diff --git a/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc b/libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc
index a80fe66beff..353fde53cce 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_PARALLEL" } }
#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 9c8c2938a0d..05af7e23b1b 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_PARALLEL" } }
#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 e48facb7173..d53da3c199b 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_PARALLEL" } }
#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 7dd43b6074d..7ad959297a9 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_PARALLEL" } }
#include <algorithm>
#include <functional>