aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2019-10-01 22:02:17 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2019-10-01 22:02:17 +0100
commit61e619b4fd1252d0fee7f4bfc821824031c52dc5 (patch)
tree349e01727cfad3dae12e0b274446f12900e56ff9
parent577663511e00773f0d4ac2da00d1add7f4529d18 (diff)
downloadgcc-61e619b4fd1252d0fee7f4bfc821824031c52dc5.zip
gcc-61e619b4fd1252d0fee7f4bfc821824031c52dc5.tar.gz
gcc-61e619b4fd1252d0fee7f4bfc821824031c52dc5.tar.bz2
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. From-SVN: r276430
-rw-r--r--libstdc++-v3/ChangeLog28
-rw-r--r--libstdc++-v3/testsuite/17_intro/using_namespace_std_tr1_neg.cc2
-rw-r--r--libstdc++-v3/testsuite/20_util/hash/84998.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/deque/types/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/forward_list/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/list/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/map/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/multimap/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/multiset/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/set/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/unordered_map/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/unordered_multimap/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/unordered_multiset/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/unordered_set/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/cons/destructible_debug_neg.cc1
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/types/pmr_typedefs_debug.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/binary_search/partitioned.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/copy/86658.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/equal_range/partitioned.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/71545.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/lower_bound/partitioned.cc1
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/upper_bound/partitioned.cc1
22 files changed, 49 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5b12f56..2a95767 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,33 @@
2019-10-01 Jonathan Wakely <jwakely@redhat.com>
+ * 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.
+
* include/parallel/algo.h: Replace non-reserved names.
* include/parallel/multiway_merge.h: Likewise.
* include/parallel/multiway_mergesort.h: 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 3124276..bdc4150 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 1cf57e9..b00df22 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 ac96584..9bee219 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 7df01d5..66138ba 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 d59f8c4..b1bb271 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 d066730..c959b69 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 641fe26..062e9b2 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 2fa4dda..5ac8f98 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 785986c..b705108 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 8b3237e..73c7f33 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 50fcf10..2328a3e 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 8a77d51..a41c23b 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 93546db..c6422db 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 061bb41..daeab2f 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 62fb5b6..1db6897 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 43d260e..14a437c 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 7092c8b..410985c 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 a80fe66..353fde5 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 9c8c293..05af7e2 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 e48facb..d53da3c 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 7dd43b6..7ad9592 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>