From 01e3c2296ab9c74724c6cde8cd2b224640ece969 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 23 Mar 2017 19:40:41 +0000 Subject: [PATCH] Fix Debug Mode test failures * testsuite/23_containers/array/tuple_interface/ tuple_element_debug_neg.cc: Adjust dg-error. * testsuite/23_containers/list/operations/78389.cc: Fix less-than to define a valid strict weak ordering. * testsuite/23_containers/priority_queue/67085.cc: Disable test for Debug Mode, due to debug checks making extra copies of predicate. * testsuite/ext/pb_ds/regression/priority_queue_binary_heap-62045.cc: Likewise. From-SVN: r246426 --- libstdc++-v3/ChangeLog | 9 +++++++++ .../array/tuple_interface/tuple_element_debug_neg.cc | 2 +- .../testsuite/23_containers/list/operations/78389.cc | 2 +- .../testsuite/23_containers/priority_queue/67085.cc | 1 + .../pb_ds/regression/priority_queue_binary_heap-62045.cc | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e5ffec522c3..a3b6d6d74f0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,14 @@ 2017-03-23 Jonathan Wakely + * testsuite/23_containers/array/tuple_interface/ + tuple_element_debug_neg.cc: Adjust dg-error. + * testsuite/23_containers/list/operations/78389.cc: Fix less-than to + define a valid strict weak ordering. + * testsuite/23_containers/priority_queue/67085.cc: Disable test for + Debug Mode, due to debug checks making extra copies of predicate. + * testsuite/ext/pb_ds/regression/priority_queue_binary_heap-62045.cc: + Likewise. + * doc/xml/faq.xml: Add link. * doc/xml/manual/backwards_compatibility.xml: Remove outdated information on pre-ISO headers. Replace broken link to C++ FAQ Lite. diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc index 894acefa317..e433c6e0a63 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc @@ -22,4 +22,4 @@ typedef std::tuple_element<1, std::array>::type type; -// { dg-error "static assertion failed" "" { target *-*-* } 316 } +// { dg-error "static assertion failed" "" { target *-*-* } 323 } diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/78389.cc b/libstdc++-v3/testsuite/23_containers/list/operations/78389.cc index e0cc6e63c76..a35b2c9897e 100644 --- a/libstdc++-v3/testsuite/23_containers/list/operations/78389.cc +++ b/libstdc++-v3/testsuite/23_containers/list/operations/78389.cc @@ -48,7 +48,7 @@ bool operator<(const X&, const X&) { if (++count_X >= throw_after_X) { throw 666; } - return true; + return false; } diff --git a/libstdc++-v3/testsuite/23_containers/priority_queue/67085.cc b/libstdc++-v3/testsuite/23_containers/priority_queue/67085.cc index 9f4da585dd8..06c7a243a38 100644 --- a/libstdc++-v3/testsuite/23_containers/priority_queue/67085.cc +++ b/libstdc++-v3/testsuite/23_containers/priority_queue/67085.cc @@ -16,6 +16,7 @@ // . // { dg-do run { target c++11 } } +// { dg-require-normal-mode "" } #include #include diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_binary_heap-62045.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_binary_heap-62045.cc index a61d36f67b3..1cc92856dc7 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_binary_heap-62045.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_binary_heap-62045.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// { dg-do run } +// { dg-require-normal-mode "" } #include #include -- 2.30.2