binutils-gdb/gdb/testsuite/gdb.opt/solib-intra-step.exp
Tom de Vries 620ec3caae [gdb/testsuite] Fix gdb.opt/solib-intra-step.exp with -m32 and gcc-10
When running test-case gdb.opt/solib-intra-step.exp with target board
unix/-m32 and gcc-10, I run into:
...
(gdb) step^M
__x86.get_pc_thunk.bx () at ../sysdeps/i386/crti.S:68^M
68      ../sysdeps/i386/crti.S: No such file or directory.^M
(gdb) step^M
shlib_second (dummy=0) at solib-intra-step-lib.c:23^M
23        abort (); /* second-hit */^M
(gdb) FAIL: gdb.opt/solib-intra-step.exp: second-hit
...

The problem is that the test-case expects to step past the retry line,
which is optional.

Fix this by removing the state tracking logic from the gdb_test_multiples.  It
makes the test more difficult to understand, and doesn't specifically test for
faulty gdb behaviour.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2021-01-29  Tom de Vries  <tdevries@suse.de>

	* gdb.opt/solib-intra-step.exp: Remove state tracking logic.
2021-01-29 05:12:46 +01:00

86 lines
2.1 KiB
Plaintext

# Copyright 2015-2021 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/>.
standard_testfile
if {[skip_shlib_tests]} {
return 0
}
# Library file.
set libname "${testfile}-lib"
set srcfile_lib ${srcdir}/${subdir}/${libname}.c
set binfile_lib [standard_output_file ${libname}.so]
set lib_flags [list debug optimize=-O2]
# Binary file.
set testfile "${testfile}-main"
set srcfile ${srcdir}/${subdir}/${testfile}.c
set binfile [standard_output_file ${testfile}]
set bin_flags [list debug shlib=${binfile_lib}]
if [get_compiler_info] {
return -1
}
if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
|| [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
untested "failed to compile"
return -1
}
clean_restart ${binfile}
gdb_load_shlib $binfile_lib
if ![runto_main] then {
return 0
}
set test "first-hit"
gdb_test_multiple "step" $test {
-re -wrap " first-hit .*" {
pass $gdb_test_name
}
-re -wrap " first-retry .*" {
send_gdb "step\n"
exp_continue
}
-re -wrap "get_pc_thunk.*" {
send_gdb "step\n"
exp_continue
}
}
set test "second-hit"
gdb_test_multiple "step" $test {
-re -wrap " second-hit .*" {
pass $gdb_test_name
}
-re -wrap " second-retry .*" {
send_gdb "step\n"
exp_continue
}
-re -wrap "get_pc_thunk.*" {
send_gdb "step\n"
exp_continue
}
}
if ![runto_main] then {
return 0
}
gdb_breakpoint "shlib_second"
gdb_continue_to_breakpoint "second-hit" ".* (second-hit|second-retry) .*"