diff options
| -rw-r--r-- | gdb/breakpoint.c | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/break-main-file-remove-fail.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/hw-sw-break-same-address.exp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index fdb184a..552b789 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -11342,9 +11342,9 @@ update_global_location_list (enum ugll_insert_mode insert_mode) Note that at this point, old_loc->owner is still valid, as delete_breakpoint frees the breakpoint only after calling us. */ - gdb_printf (_("warning: Error removing " - "breakpoint %d\n"), - old_loc->owner->number); + warning (_("error removing breakpoint %d at %s"), + old_loc->owner->number, + paddress (old_loc->gdbarch, old_loc->address)); } removed = true; } diff --git a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp index c7cf4f3..5e689fa 100644 --- a/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp +++ b/gdb/testsuite/gdb.base/break-main-file-remove-fail.exp @@ -100,7 +100,7 @@ proc test_remove_bp { initial_load } { # get_integer_valueof. set munmap -1 gdb_test_multiple "print /d ${munmap_expr}" "get result of munmap call" { - -re -wrap "^(?:warning: Error removing breakpoint $::decimal\r\n)?\\$\[0-9\]* = (\[-\]*\[0-9\]*).*" { + -re -wrap "^(?:warning: error removing breakpoint $::decimal at $::hex\r\n)?\\$\[0-9\]* = (\[-\]*\[0-9\]*).*" { set munmap $expect_out(1,string) pass $gdb_test_name } @@ -112,7 +112,7 @@ proc test_remove_bp { initial_load } { } gdb_test "delete \$bpnum" \ - "warning: Error removing breakpoint .*" \ + "^warning: error removing breakpoint $::decimal at $::hex" \ "failure to remove breakpoint warns" } } diff --git a/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp b/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp index 9f94118..6ac69e5 100644 --- a/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp +++ b/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp @@ -50,7 +50,7 @@ with_test_prefix "hw-sw" { # A bad GDB debugging against GDBserver would output a warning # here: # delete breakpoints - # warning: Error removing breakpoint 3 + # warning: error removing breakpoint 3 at <ADDRESS> # (gdb) FAIL: gdb.base/hw-sw-break-same-address.exp: hw-sw: delete breakpoints gdb_test_no_output "delete breakpoints" } |