Files
binutils-gdb/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
Andrew Burgess 25902bd0ba gdb/testsuite: make more use of clean_restart's argument
Commits:

  commit aaad5a3254
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 3

  commit 2e61486fce
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 2

  commit 202beb3fee
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 1

were made to work around the changes to clean_restart in commit:

  commit cba778b944
  Date:   Sun Sep 7 11:53:30 2025 +0200

      [gdb/testsuite] Error out on clean_restart <absolute filename>

These commits added a lot of calls to gdb_load which can be removed in
many cases by passing $testfile to clean_restart, or by switching to
use prepare_for_testing to compile the test executable.

In this commit I've gone through the gdb.base/ directory and removed
as many of the gdb_load calls as possible.  I was only looking for
places where the gdb_load call immediately follows the call to
clean_restart.  And I did skip a few where it was not as simple as
just passing $testfile.

Where possible I've updated tests to use calls to prepare_for_testing,
and simply removed the clean_restart call altogether (this is done as
part of prepare_for_testing).  This is, I think, the best solution.

In other cases I've removed the gdb_load call, and passed $testfile to
clean_restart.  I've preferred $::testfile to adding a 'global'
declaration, and in some cases switching to testfile has allowed me to
remove the 'global binfile' as an additional cleanup.

I ran the complete set of tests that I touched and I didn't see any
regressions, so I don't believe I broke anything.

I know that there are probably gdb_load calls that can be cleaned up
in other testsuite sub-directories, if/when this patch is merged I'll
take a look at those too.

Reviewed-By: Tom de Vries <tdevries@suse.de>
2025-12-01 14:00:47 +00:00

94 lines
3.0 KiB
Plaintext

# Copyright 2018-2025 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This testcase is a regression test for a regression in the in-line
# step-over machinery. If a resumption that starts a step-over
# failed, a following resumption would make GDB hang forever:
#
# (gdb) b *0
# Breakpoint 2 at 0x0
# continue
# Continuing.
# Warning:
# Cannot insert breakpoint 2.
# Cannot access memory at address 0x0
#
# Command aborted.
# delete breakpoints
# Delete all breakpoints, watchpoints, tracepoints, and catchpoints? (y or n) y
# (gdb) b function
# Breakpoint 3 at 0x40048b: file test.c, line 33.
# continue
# Continuing.
# *GDB hangs forever*
standard_testfile
if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
return -1
}
# DISPLACED indicates whether to use displaced-stepping.
proc do_test {displaced breakpoint_always_inserted} {
global gdb_prompt decimal
global srcfile
clean_restart $::testfile
gdb_test_no_output "set displaced-stepping $displaced"
gdb_test_no_output "set breakpoint always-inserted $breakpoint_always_inserted"
if {![runto_main]} {
return -1
}
# We rely on not being able to set a breakpoint at 0, as proxy for
# any kind of breakpoint insertion failure. If we can examine
# what's at memory address 0, it is possible that we could also
# execute it.
if {[is_address_zero_readable]} {
untested "memory at address 0 is possibly executable"
return
}
# Set a breakpoint that fails to insert.
if { $breakpoint_always_inserted == "on" } {
gdb_test "b *0" "Breakpoint $decimal at 0x0.*"
} else {
gdb_test "b *0" "Breakpoint $decimal at 0x0"
}
gdb_test "continue" \
"Command aborted\\." \
"continue aborts"
# Delete the "bad" breakpoint and try continuing again.
delete_breakpoints
gdb_test "b function" "Breakpoint $decimal .*$srcfile.*"
gdb_test "continue" \
"Breakpoint $decimal, function \\(\\) at .*$srcfile:.*" \
"continue to function"
}
# This testcase exercises a regression with the in-line step-over
# machinery. So make sure this runs with displaced stepping disabled,
# and for good measure, also try with displaced stepping enabled.
foreach_with_prefix displaced-stepping {"off" "on"} {
foreach_with_prefix breakpoint-always-inserted {"off" "on"} {
do_test ${displaced-stepping} ${breakpoint-always-inserted}
}
}