From 07473109e11e41d979c33b839551ac1c6f8495b9 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 10 Apr 2015 19:23:24 +0100 Subject: [PATCH] step-over-trips-on-watchpoint.exp: Don't put addresses in test messages Diffing test results, I noticed: -PASS: gdb.threads/step-over-trips-on-watchpoint.exp: displaced=on: with thread-specific bp: next: b *0x0000000000400811 thread 1 +PASS: gdb.threads/step-over-trips-on-watchpoint.exp: displaced=on: with thread-specific bp: next: b *0x00000000004007d1 thread 1 gdb/testsuite/ChangeLog: 2015-04-10 Pedro Alves * gdb.threads/step-over-trips-on-watchpoint.exp (do_test): Use test messages that don't include the breakpoint address. --- gdb/testsuite/ChangeLog | 5 +++++ .../gdb.threads/step-over-trips-on-watchpoint.exp | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f28a08f7f2..e482bbbc14 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-04-10 Pedro Alves + + * gdb.threads/step-over-trips-on-watchpoint.exp (do_test): Use + test messages that don't include the breakpoint address. + 2015-04-10 Yao Qi * gdb.base/watchpoint-reuse-slot.exp (valid_addr_p): Return diff --git a/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp b/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp index aa983f7c74..89b66e55de 100644 --- a/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp +++ b/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp @@ -96,7 +96,8 @@ proc do_test { displaced with_bp } { delete_breakpoints } - gdb_breakpoint "*$address_triggers_watch" + gdb_test "break *$address_triggers_watch" "Breakpoint .*" \ + "set breakpoint at address that triggers watch" gdb_continue_to_breakpoint \ "run to instruction that triggers watch in thread 2" @@ -105,7 +106,9 @@ proc do_test { displaced with_bp } { gdb_test "watch watch_me" "Hardware watchpoint .*" if ${with_bp} { - gdb_test "b *$after_address_triggers_watch thread 1" + gdb_test "b *$after_address_triggers_watch thread 1" \ + "Breakpoint .*" \ + "set breakpoint specific to thread 1" } # Switch back to thread 1 and disable scheduler locking.