* gdb.base/watch_thread_num.exp: Don't run tests that require

	watchpoints if the target doesn't support them.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f958980..e184e02 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-13  Nathan Froyd  <froydnj@codesourcery.com>
+
+       * 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  <dje@google.com>
 
        * 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 4d34d72..be8ed48 100644 (file)
--- 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
+    }
 }