From 48ca5676924d2609f1b9ea1990719c9eb41e88a2 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 27 Oct 2022 17:14:33 +0200 Subject: [PATCH] [gdb/testsuite] Remove address from test names I noticed an address in a test name: ... PASS: gdb.base/eh_return.exp: gdb_breakpoint: \ set breakpoint at *0x000000000040071b ... Stabilize the test name by using "set breakpoint on address" instead. Likewise in two other test-cases. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/eh_return.exp | 2 +- gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp | 2 +- gdb/testsuite/gdb.opt/inline-break.exp | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.base/eh_return.exp b/gdb/testsuite/gdb.base/eh_return.exp index 6e4b9bd0bba..a6dda78e013 100644 --- a/gdb/testsuite/gdb.base/eh_return.exp +++ b/gdb/testsuite/gdb.base/eh_return.exp @@ -73,7 +73,7 @@ if { $address == -1 } { clean_restart ${binfile} -gdb_breakpoint "*$address" message +gdb_assert [gdb_breakpoint "*$address" no-message] "set breakpoint on address" # The assert did not reproduce when running to main, and continuing to the # breakpoint, so instead, run to the breakpoint. diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp index 17537585ad2..2e479d6ebe2 100644 --- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp +++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp @@ -45,7 +45,7 @@ if { $next_insn_addr == "" } { return -1 } -gdb_test "b *$next_insn_addr" "Breakpoint .*" +gdb_test "b *$next_insn_addr" "Breakpoint .*" "set breakpoint on address" # So that GDB doesn't try to remove the regular breakpoint when the # step finishes. diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp index 24dd6ebaf0a..708fd74aa1e 100644 --- a/gdb/testsuite/gdb.opt/inline-break.exp +++ b/gdb/testsuite/gdb.opt/inline-break.exp @@ -292,7 +292,9 @@ with_test_prefix "address" { # Set the breakpoint by address, and check that GDB reports the # breakpoint location being the inline function. - gdb_test "break *$address" ".*Breakpoint .* at $address: file .*$srcfile, line $line." + gdb_test "break *$address" \ + ".*Breakpoint .* at $address: file .*$srcfile, line $line." \ + "set breakpoint on address" gdb_test "info break \$bpnum" "in func1 at .*$srcfile:$line" -- 2.30.2