mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 09:08:59 +00:00
25902bd0ba
Commits: commitaaad5a3254Author: 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 commit2e61486fceAuthor: 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 commit202beb3feeAuthor: 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: commitcba778b944Date: 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>
54 lines
1.6 KiB
Plaintext
54 lines
1.6 KiB
Plaintext
# Copyright 2014-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/>.
|
|
|
|
require allow_shlib_tests
|
|
|
|
standard_testfile
|
|
|
|
set lib1name $testfile-solib1
|
|
set srcfile_lib1 $srcdir/$subdir/$lib1name.c
|
|
set binfile_lib1 [standard_output_file $lib1name.so]
|
|
|
|
set lib2name $testfile-solib2
|
|
set srcfile_lib2 $srcdir/$subdir/$lib2name.c
|
|
set binfile_lib2 [standard_output_file $lib2name.so]
|
|
|
|
|
|
if { [build_executable "build shlib 1" $binfile_lib1 \
|
|
$srcfile_lib1 [list debug shlib]] != 0 } {
|
|
return
|
|
}
|
|
|
|
if { [build_executable "build shlib 2" $binfile_lib2 \
|
|
$srcfile_lib2 [list debug shlib]] != 0 } {
|
|
return
|
|
}
|
|
|
|
if { [prepare_for_testing "prepare" $testfile $srcfile \
|
|
[list debug shlib=$binfile_lib1 shlib=$binfile_lib2]] != 0 } {
|
|
return
|
|
}
|
|
|
|
gdb_load_shlib $binfile_lib1
|
|
gdb_load_shlib $binfile_lib2
|
|
|
|
if { ![runto_main] } {
|
|
return -1
|
|
}
|
|
|
|
gdb_test "next" "$decimal.*b_main \\(\\);" "step over c_main"
|
|
gdb_test "next" "$decimal.*return 0;" "step over b_main"
|
|
gdb_test "print test" " = 42"
|