diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint-hw-attach.c | 1 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint-hw-attach.exp | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f3856c4..f93eb97 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-06-28 Richard Bunt <richard.bunt@arm.com> + + * gdb.base/watchpoint-hw-attach.c (main): Remove unneeded + code. + * gdb.base/watchpoint-hw-attach.exp: Break in outermost frame. + 2018-06-28 Petr Tesarik <ptesarik@suse.cz> * gdb.base/relocate.exp: Add test for "add-symbol-file -o ". diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-attach.c b/gdb/testsuite/gdb.base/watchpoint-hw-attach.c index 9d55b28..5bfea50 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-attach.c +++ b/gdb/testsuite/gdb.base/watchpoint-hw-attach.c @@ -36,7 +36,6 @@ main (void) for (counter = 0; !should_continue && counter < 100; counter++) sleep (1); /* pidacquired */ - watched_variable = 0; /* prewatchtrigger */ /* Trigger a watchpoint. */ watched_variable = 4; printf ("My variable is %d\n", watched_variable); diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp index 0c5037c..ba7205d 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp @@ -57,12 +57,12 @@ clean_restart $binfile gdb_test "attach $testpid" "Attaching to program: .*, process $testpid.*" -gdb_test_no_output "set should_continue = 1" - # Ensure the test program is in the top frame so the required # variables are in scope. -gdb_breakpoint [gdb_get_line_number "prewatchtrigger"] -gdb_continue_to_breakpoint "prewatchtrigger" +gdb_breakpoint $srcfile:[gdb_get_line_number "pidacquired"] +gdb_continue_to_breakpoint "$srcfile:pidacquired" + +gdb_test_no_output "set should_continue = 1" gdb_test "watch watched_variable" \ "Hardware watchpoint $decimal: watched_variable" |