From 0329e9fbe830993d1f79a8cca816d6c7b6028dc6 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 8 Jul 2013 11:35:49 +0000 Subject: [PATCH] 2013-07-08 Andreas Arnez * gdb.threads/wp-replication.exp: Stop counting available hardware watchpoints after NR_THREADS iterations. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.threads/wp-replication.exp | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8db26137a76..2c0f24b76b3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-07-08 Andreas Arnez + + * gdb.threads/wp-replication.exp: Stop counting available hardware + watchpoints after NR_THREADS iterations. + 2013-07-08 Andrew Burgess * gdb.python/py-explore.exp: Add $gdb_prompt to test regexp. diff --git a/gdb/testsuite/gdb.threads/wp-replication.exp b/gdb/testsuite/gdb.threads/wp-replication.exp index 8927a434d24..c6a13b9bc17 100644 --- a/gdb/testsuite/gdb.threads/wp-replication.exp +++ b/gdb/testsuite/gdb.threads/wp-replication.exp @@ -81,6 +81,14 @@ while { $done == 0 } { gdb_test_multiple "continue" "watchpoint created successfully" { -re ".*Breakpoint 2, empty_cycle \\(\\).*$gdb_prompt $" { incr hwatch_count + + # Some targets (like S/390) behave as though supporting + # unlimited hardware watchpoints. In this case we just take a + # safe exit out of the loop. + if { $hwatch_count == $NR_THREADS } { + set done 1 + break + } } -re ".*Could not insert hardware watchpoint.*$gdb_prompt $" { set done 1 -- 2.30.2