From ac0bb574abe17ce824fc4ae22e3bb5a8242a66f7 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 13 May 2008 21:17:18 +0000 Subject: [PATCH] * gdb.base/watch_thread_num.exp: Don't run tests that require watchpoints if the target doesn't support them. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/watch_thread_num.exp | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f9589806fa9..e184e02c71e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-05-13 Nathan Froyd + + * gdb.base/watch_thread_num.exp: Don't run tests that require + watchpoints if the target doesn't support them. + 2008-05-12 Doug Evans * lib/gdbserver-support.exp (find_gdbserver): Use $GDBSERVER if set. diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp index 4d34d72e178..be8ed48b649 100644 --- a/gdb/testsuite/gdb.base/watch_thread_num.exp +++ b/gdb/testsuite/gdb.base/watch_thread_num.exp @@ -71,9 +71,15 @@ gdb_test "watch shared_var thread $thread_num" "Hardware watchpoint 3: shared_va gdb_test "info breakpoint 3" "stop only in thread $thread_num" for {set i 1} {$i <= 10} {incr i 1} { -gdb_test "continue" "Hardware watchpoint 3: shared_var.*" \ - "Watchpoint triggered iteration $i" -gdb_test "thread" ".*Current thread is $thread_num .*" \ - "Check thread that triggered iteration $i" + set watchpoint "Watchpoint triggered iteration $i" + set check "Check thread that triggered iteration $i" + + if {[target_info exists gdb,no_hardware_watchpoints]} { + unsupported $watchpoint + unsupported $check + } else { + gdb_test "continue" "Hardware watchpoint 3: shared_var.*" $watchpoint + gdb_test "thread" ".*Current thread is $thread_num .*" $check + } } -- 2.30.2