This is the mail archive of the mailing list for the GDB project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[commit, testsuite] Fix spurious watch_thread_num.exp failures


two years ago I updated gdb.base/watch_thread_num.exp to attempt to handle
systems that only support software watchpoints.  However, that was misguided
since software watchpoints by design cannot track thread-specific changes.

The proper fix is to skip the test completely if hardware watchpoints are
not supported, as is already done elsewhere (e.g. in test cases like

Tested on armv4l-linux-gnueabi and i386-linux.  Fixes spurious fails on ARM.

Committed to mainline.



	* gdb.base/watch_thread_num.exp: Revert 2008-09-03 change.
	Skip test completely if gdb,no_hardware_watchpoints.

Index: gdb/testsuite/gdb.base/watch_thread_num.exp
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/watch_thread_num.exp,v
retrieving revision 1.11
diff -u -p -r1.11 watch_thread_num.exp
--- gdb/testsuite/gdb.base/watch_thread_num.exp	3 Jun 2010 23:54:17 -0000	1.11
+++ gdb/testsuite/gdb.base/watch_thread_num.exp	19 Oct 2010 18:10:39 -0000
@@ -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 {
-# 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 comma
 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
  Dr. Ulrich Weigand
  GNU Toolchain for Linux on System z and Cell BE

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]