* gdb.base/watch_thread_num.exp: Revert 2008-09-03 change.

Skip test completely if gdb,no_hardware_watchpoints.
This commit is contained in:
Ulrich Weigand 2010-10-19 21:29:23 +00:00
parent 2c04da0de0
commit 8e6a5956eb
2 changed files with 13 additions and 7 deletions

View file

@ -1,3 +1,8 @@
2010-10-19 Ulrich Weigand <uweigand@de.ibm.com>
* gdb.base/watch_thread_num.exp: Revert 2008-09-03 change.
Skip test completely if gdb,no_hardware_watchpoints.
2010-10-19 Ulrich Weigand <uweigand@de.ibm.com>
* gdb.base/foll-fork.exp: Make regexps to match catchpoint hits more

View file

@ -23,6 +23,12 @@ if $tracelevel then {
strace $tracelevel
}
# This test verifies that a watchpoint is detected in the proper thread
# so the test is only meaningful on a system with hardware watchpoints.
if [target_info exists gdb,no_hardware_watchpoints] {
return 0;
}
set testfile watch_thread_num
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
@ -47,11 +53,6 @@ if { ![runto main] } then {
return
}
# Disable hardware watchpoints if necessary.
if [target_info exists gdb,no_hardware_watchpoints] {
gdb_test_no_output "set can-use-hw-watchpoints 0" ""
}
gdb_test "watch shared_var thread 0" "Unknown thread 0\." "Watchpoint on invalid thread"
gdb_test "watch shared_var thread" "A syntax error in expression, near `thread'\." "Invalid watch syntax"
@ -71,14 +72,14 @@ gdb_test_multiple "thread" "Thread command" {
set thread_num "$expect_out(1,string)"
gdb_test_no_output "disable 2" "Disable breakpoint 2"
gdb_test "watch shared_var thread $thread_num" "atchpoint 3: shared_var" "Watchpoint on shared variable"
gdb_test "watch shared_var thread $thread_num" "Hardware watchpoint 3: shared_var" "Watchpoint on shared variable"
gdb_test "info breakpoint 3" "stop only in thread $thread_num"
for {set i 1} {$i <= 10} {incr i 1} {
set watchpoint "Watchpoint triggered iteration $i"
set check "Check thread that triggered iteration $i"
gdb_test "continue" "atchpoint 3: shared_var.*" $watchpoint
gdb_test "continue" "Hardware watchpoint 3: shared_var.*" $watchpoint
gdb_test "thread" ".*Current thread is $thread_num .*" $check
}