[PATCH] Fix Debug Mode test failures

[PATCH] Fix Debug Mode test failures

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 532 bytes --]

This fixes some recent testsuite FAILures with Debug Mode.

	* 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.

Tested powerpc64le-linux, committing to trunk.



[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 2796 bytes --]

commit f622cdad191e50e65522d8f36906ccf31ed132a2
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Mar 23 17:01:08 2017 +0000

    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.

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 894acef..e433c6e 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<int, 1>>::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 e0cc6e6..a35b2c9 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 9f4da58..06c7a24 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 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do run { target c++11 } }
+// { dg-require-normal-mode "" }
 
 #include <queue>
 #include <testsuite_hooks.h>
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 a61d36f..1cc9285 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
 // <http://www.gnu.org/licenses/>.
 
-// { dg-do run }
+// { dg-require-normal-mode "" }
 
 #include <ext/pb_ds/priority_queue.hpp>
 #include <testsuite_hooks.h>