mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
cce0ae568c
The previous patch to add -prompt/-lbl to gdb_test introduced a regression: Before, you could specify an explicit empty message to indicate you didn't want to PASS, like so: gdb_test COMMAND PATTERN "" After said patch, gdb_test no longer distinguishes no-message-specified vs empty-message, so tests that previously would be silent on PASS, now started emitting PASS messages based on COMMAND. This in turn introduced a number of PATH/DUPLICATE violations in the testsuite. This commit fixes all the regressions I could see. This patch uses the new -nopass feature introduced in the previous commit, but tries to avoid it if possible. Most of the patch fixes DUPLICATE issues the usual way, of using with_test_prefix or explicit unique messages. See previous commit's log for more info. In addition to looking for DUPLICATEs, I also looked for cases where we would now end up with an empty message in gdb.sum, due to a gdb_test being passed both no message and empty command. E.g., this in gdb.ada/bp_reset.exp: gdb_run_cmd gdb_test "" "Breakpoint $decimal, foo\\.nested_sub \\(\\).*" was resulting in this in gdb.sum: PASS: gdb.ada/bp_reset.exp: I fixed such cases by passing an explicit message. We may want to make such cases error out. Tested on x86_64 GNU/Linux, native and native-extended-gdbserver. I see zero PATH cases now. I get zero DUPLICATEs with native testing now. I still see some DUPLICATEs with native-extended-gdbserver, but those were preexisting, unrelated to the gdb_test change. Change-Id: I5375f23f073493e0672190a0ec2e847938a580b2
105 lines
2.7 KiB
Plaintext
105 lines
2.7 KiB
Plaintext
# Copyright 2012-2022 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/>.
|
|
|
|
if { [skip_shlib_tests] } {
|
|
return 0
|
|
}
|
|
|
|
standard_testfile
|
|
|
|
set libname $testfile-solib
|
|
set srcfile_lib $srcdir/$subdir/$libname.c
|
|
set binfile_lib [standard_output_file $libname.so]
|
|
|
|
if { [gdb_compile_shlib $srcfile_lib $binfile_lib {}] != "" } {
|
|
untested "failed to compile shared library"
|
|
return -1
|
|
}
|
|
|
|
if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
|
|
[list debug shlib_load additional_flags=-DSHLIB_NAME=\"$binfile_lib\"]] } {
|
|
return -1
|
|
}
|
|
|
|
# Enable stop-on-solib-events
|
|
gdb_test_no_output "set stop-on-solib-events 1"
|
|
|
|
# Start the inferior and run to the first stop
|
|
gdb_run_cmd
|
|
gdb_test "" ".*Stopped due to shared library event.*" \
|
|
"run to shared library event"
|
|
|
|
# Check if we're using probes.
|
|
set using_probes 0
|
|
|
|
# Get PC.
|
|
set pc ""
|
|
gdb_test_multiple "p /x \$pc" "" {
|
|
-re -wrap " = ($hex)" {
|
|
set pc $expect_out(1,string)
|
|
}
|
|
-re -wrap "" {
|
|
}
|
|
}
|
|
if { $pc == "" } {
|
|
unsupported "Couldn't get $pc"
|
|
return -1
|
|
}
|
|
regsub "0x0*" $pc "" pc
|
|
|
|
# Verify that pc is at info_start probe address.
|
|
gdb_test_multiple "info probes stap rtld" "" {
|
|
-re -wrap "init_start +0x0*$pc .*" {
|
|
set using_probes 1
|
|
}
|
|
-re -wrap "" {
|
|
}
|
|
}
|
|
|
|
if { ! $using_probes } {
|
|
unsupported "probes not present on this system"
|
|
return -1
|
|
}
|
|
|
|
set sysroot ""
|
|
set test "show sysroot"
|
|
gdb_test_multiple $test $test {
|
|
-re "The current system root is \"(.*)\"\..*${gdb_prompt} $" {
|
|
set sysroot $expect_out(1,string)
|
|
}
|
|
}
|
|
|
|
# GDB strips "target:" from the start of filenames
|
|
# when operating on the local filesystem
|
|
regsub "^target:" "$sysroot" "(target:)?" sysroot
|
|
|
|
# Run til it loads our library
|
|
set test "run til our library loads"
|
|
set not_loaded_library 1
|
|
while { $not_loaded_library } {
|
|
set not_loaded_library 0
|
|
gdb_test_multiple "c" $test {
|
|
-re "Inferior loaded $sysroot$binfile_lib\\M.*$gdb_prompt $" {
|
|
pass $test
|
|
}
|
|
-re "Stopped due to shared library event\\M.*$gdb_prompt $" {
|
|
set not_loaded_library 1
|
|
}
|
|
}
|
|
}
|
|
|
|
# Call something to ensure that relocation occurred
|
|
gdb_test "call (int) foo(23)" "\\\$.* = 31.*\\\M.*"
|