Files
binutils-gdb/gdb/testsuite/gdb.base/print-symbol-loading.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

143 lines
4.2 KiB
Plaintext

# Copyright 2012-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 the "print symbol-loading" option.
require allow_shlib_tests gcore_cmd_available
standard_testfile print-symbol-loading-main.c
set libfile print-symbol-loading-lib
set srcfile_lib ${libfile}.c
set binfile_lib [standard_output_file ${libfile}.so]
set gcorefile ${binfile}.gcore
set objfile [standard_output_file ${testfile}.o]
if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} {debug}] != ""
|| [gdb_compile ${srcdir}/${subdir}/${srcfile} ${objfile} object {debug}] != "" } {
untested "failed to compile"
return -1
}
set opts [list debug shlib=${binfile_lib}]
if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } {
untested "failed to compile"
return -1
}
clean_restart $testfile
gdb_load_shlib ${binfile_lib}
if {![runto lib]} {
return -1
}
if {![gdb_gcore_cmd $gcorefile "save a corefile"]} {
return -1
}
proc test_load_core { print_symbol_loading } {
global binfile binfile_lib gcorefile srcdir subdir
with_test_prefix "core ${print_symbol_loading}" {
clean_restart
gdb_test_no_output "set print symbol-loading $print_symbol_loading"
if { ${print_symbol_loading} != "off" } {
gdb_test "file $binfile" "Reading symbols from.*" "file"
} else {
gdb_test_no_output "file $binfile" "file"
}
# Rename the shared lib so gdb can't find it.
remote_exec host "mv -f ${binfile_lib} ${binfile_lib}.save"
gdb_test "core ${gcorefile}" "Core was generated by .*" \
"re-load generated corefile"
# Now put it back and use "set solib-search-path" to trigger
# loading of symbols.
remote_exec host "mv -f ${binfile_lib}.save ${binfile_lib}"
set test_name "load shared-lib"
switch "${print_symbol_loading}" {
"off" {
gdb_test_no_output "set solib-search-path [file dirname ${binfile_lib}]" \
${test_name}
}
"brief" {
gdb_test "set solib-search-path [file dirname ${binfile_lib}]" \
"Loading symbols for shared libraries\\." \
${test_name}
}
"full" {
gdb_test "set solib-search-path [file dirname ${binfile_lib}]" \
"Reading symbols from.*" \
${test_name}
}
}
gdb_test "frame" "#0 \[^\r\n\]* lib .*" "library got loaded"
}
}
test_load_core off
test_load_core brief
test_load_core full
# Now test the sharedlibrary command.
proc test_load_shlib { print_symbol_loading } {
global gdb_prompt
with_test_prefix "shlib ${print_symbol_loading}" {
clean_restart $::testfile
if {![runto_main]} {
return -1
}
gdb_test_no_output "nosharedlibrary"
gdb_test_no_output "set print symbol-loading $print_symbol_loading"
set test_name "load shared-lib"
set libc_re \
[multi_line \
"Symbols already loaded for\[^\r\n\]*\\/libc\\.\[^\r\n\]*(" \
"Symbols already loaded for\[^\r\n\]*\\/libpthread\\.\[^\r\n\]*)?"]
switch ${print_symbol_loading} {
"off" {
set cmd "sharedlibrary .*"
set cmd_regex [string_to_regexp $cmd]
gdb_test_multiple $cmd $test_name {
-re "^$cmd_regex\r\n$gdb_prompt $" {
pass $test_name
}
-re "^$cmd_regex\r\n$libc_re\r\n$gdb_prompt $" {
pass $test_name
}
}
}
"brief" {
gdb_test "sharedlibrary .*" \
"Loading symbols for shared libraries: \\.\\*.*?(?:Symbols already loaded for .*?libc)?" \
${test_name}
}
"full" {
gdb_test "sharedlibrary .*" \
"Reading symbols from.*" \
${test_name}
}
}
gdb_breakpoint "lib"
gdb_continue_to_breakpoint "lib"
gdb_test "frame" "#0 \[^\r\n\]* lib .*" "library got loaded"
}
}
test_load_shlib off
test_load_shlib brief
test_load_shlib full