Files
binutils-gdb/gdb/testsuite/gdb.base/patch.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

108 lines
3.0 KiB
Plaintext

# Copyright 2022-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/>.
# Test patching executables and core files, with "set write on".
standard_testfile
if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
return -1
}
# Check that we can patch an executable.
with_test_prefix "exec" {
clean_restart
gdb_test_no_output "set write on"
gdb_load $binfile
gdb_test "p extern_global" " = 1" "read original value"
gdb_test "p extern_global = 2" " = 2" "modify value"
gdb_test "p extern_global" " = 2" "value modified"
clean_restart $testfile
gdb_test "p extern_global" " = 2" "value modified persisted"
}
# Check that we can patch a core file.
# Generate a core file.
with_test_prefix "gcore" {
clean_restart $testfile
if {![runto_main]} {
return
}
# Extract the value at PC, and add 1, letting it wrap if
# necessary. This is the value we will poke into memory.
set poke_value ""
gdb_test_multiple "p/x (*(unsigned char *) \$pc) + 1" "compute poke value" {
-re -wrap " = ($hex)" {
set poke_value $expect_out(1,string)
pass $gdb_test_name
}
}
if {$poke_value == ""} {
return
}
set corefile [standard_output_file gcore.test]
set core_supported [gdb_gcore_cmd "$corefile" "save a corefile"]
if {!$core_supported} {
return
}
}
# Load it into GDB with "set write on", and change the instruction at
# PC.
with_test_prefix "load core, write on" {
# Don't load a binary, we want to make sure we're patching the
# core, not the executable.
clean_restart
gdb_test_no_output "set write on"
set core_loaded [gdb_core_cmd "$corefile" "re-load generated corefile"]
if { $core_loaded == -1 } {
return
}
gdb_test "p/x *(unsigned char *) \$pc = $poke_value" \
" = $poke_value" \
"poke value"
gdb_test "p/x *(unsigned char *) \$pc" \
" = $poke_value" \
"value modified"
}
# Re-load it into a new GDB session, now with "set write off", and
# confirm the value change persisted.
with_test_prefix "re-load modified core" {
# Don't load a binary, we want to make sure we've patched the
# core, not the executable.
clean_restart
set core_loaded [gdb_core_cmd "$corefile" "re-load generated corefile"]
gdb_assert { $core_loaded != -1 } "core re-loaded"
gdb_test "p/x *(unsigned char *) \$pc" \
" = $poke_value" \
"value modified persisted"
}