FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb/testsuite: update tests looking for "DWARF 2" debug format

Browse source 
Commit ab557072b8 ("gdb: use actual DWARF version in compunit's
debugformat field") changes the debug format string in "info source" to
show the actual DWARF version, rather than always show "DWARF 2".

However, it failed to consider that some tests checked for the "DWARF 2"
string to see if the test program is compiled with DWARF debug
information.  Since everything is compiled with DWARF 4 or 5 nowadays,
that changed the behavior of those tests.  Notably, it prevent the
tests using skip_inline_var_tests to run.

Grep through the testsuite for "DWARF 2" and change all occurrences I
could find to use "DWARF [0-9]" instead (that string is passed to TCL's
string match).

Change-Id: Ic7fb0217fb9623880c6f155da6becba0f567a885
This commit is contained in:
Simon Marchi 2021-12-02 10:28:40 -05:00
parent 9a73e1cafe
commit d184a3c16a
9 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gdb/testsuite/gdb.base/complex.exp
View file

@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
if [runto f2] then {
get_debug_format
if { [test_compiler_info gcc-2-*] && [test_debug_format "DWARF 2"] } then {
if { [test_compiler_info gcc-2-*] && [test_debug_format "DWARF \[0-9\]"] } then {
setup_xfail "*-*-*"
}
gdb_test "p *y" "\\\$\[0-9\]* = \{c = 42 '\\*', f = 1 \\+ 0i\}" \

2
gdb/testsuite/gdb.base/constvars.exp
View file

@ -59,7 +59,7 @@ get_debug_format
proc local_compiler_xfail_check { } {
if { [test_compiler_info gcc-2-*] } then {
if { ![test_debug_format "HP"] \
&& ![test_debug_format "DWARF 2"] } then {
&& ![test_debug_format "DWARF \[0-9\]"] } then {
setup_xfail "*-*-*"
}
}

2
gdb/testsuite/gdb.base/included.exp
View file

@ -22,7 +22,7 @@ gdb_test_no_output "set listsize 1"
gdb_test "list -q main" ".*"
get_debug_format
set non_dwarf [expr ! [test_debug_format "DWARF 2"]]
set non_dwarf [expr ! [test_debug_format "DWARF \[0-9\]"]]
# We should be able to find the source file containing the definition,
# even though it was an included header.

8
gdb/testsuite/gdb.base/structs.exp
View file

@ -232,8 +232,8 @@ proc test_struct_calls { n } {
set tests "call $n ${testfile}"
# Call fun${n}, checking the printed return-value.
setup_compiler_kfails structs-tc-tll gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455
setup_compiler_kfails structs-tc-td gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455
setup_compiler_kfails structs-tc-tll gcc-3-3-* "DWARF \[0-9\]" i*86-*-* gdb/1455
setup_compiler_kfails structs-tc-td gcc-3-3-* "DWARF \[0-9\]" i*86-*-* gdb/1455
gdb_test "p/c fun${n}()" "[foo ${n}]" "p/c fun<n>(); ${tests}"
# Check that GDB can always pass a structure to an inferior function.
@ -244,8 +244,8 @@ proc test_struct_calls { n } {
# examining that global to confirm that the value is as expected.
gdb_test_no_output "call Fun${n}(foo${n})" "call Fun<n>(foo<n>); ${tests}"
setup_compiler_kfails structs-tc-tll gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455
setup_compiler_kfails structs-tc-td gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455
setup_compiler_kfails structs-tc-tll gcc-3-3-* "DWARF \[0-9\]" i*86-*-* gdb/1455
setup_compiler_kfails structs-tc-td gcc-3-3-* "DWARF \[0-9\]" i*86-*-* gdb/1455
gdb_test "p/c L${n}" [foo ${n}] "p/c L<n>; ${tests}"
}

2
gdb/testsuite/gdb.base/volatile.exp
View file

@ -60,7 +60,7 @@ get_debug_format
proc local_compiler_xfail_check { } {
if { [test_compiler_info gcc-2-*] } then {
if { ![test_debug_format "HP"] \
&& ![test_debug_format "DWARF 2"] } then {
&& ![test_debug_format "DWARF \[0-9\]"] } then {
setup_xfail "*-*-*"
}
}

2
gdb/testsuite/gdb.cp/class2.exp
View file

@ -67,7 +67,7 @@ gdb_test_multiple "print * aap" "print * aap at marker return 0" {
pass "print * aap at marker return 0"
}
-re "= {.*a1 = .*}\r\n$gdb_prompt $" {
if { [test_compiler_info gcc-2-*] && [test_debug_format "DWARF 2"] } {
if { [test_compiler_info gcc-2-*] && [test_debug_format "DWARF \[0-9\]"] } {
# gcc 2.95.3 -gdwarf-2
setup_kfail "gdb/1465" "*-*-*"
}

2
gdb/testsuite/gdb.cp/m-static.exp
View file

@ -48,7 +48,7 @@ if ![runto_main] then {
}
get_debug_format
set non_dwarf [expr ! [test_debug_format "DWARF 2"]]
set non_dwarf [expr ! [test_debug_format "DWARF \[0-9\]"]]
# First, run to after we've constructed all the objects:

4
gdb/testsuite/gdb.dwarf2/pr10770.exp
View file

@ -25,9 +25,9 @@ if {![runto_main]} {
return -1
}
# This test also requires DWARF 2.
# This test also requires DWARF.
get_debug_format
if {![test_debug_format "DWARF 2"]} {
if {![test_debug_format "DWARF \[0-9\]"]} {
return -1
}

8
gdb/testsuite/lib/gdb.exp
View file

@ -3683,8 +3683,8 @@ gdb_caching_proc skip_ifunc_tests {
# backtraces. Requires get_compiler_info and get_debug_format.
proc skip_inline_frame_tests {} {
# GDB only recognizes inlining information in DWARF 2 (DWARF 3).
if { ! [test_debug_format "DWARF 2"] } {
# GDB only recognizes inlining information in DWARF.
if { ! [test_debug_format "DWARF \[0-9\]"] } {
return 1
}
@ -3702,8 +3702,8 @@ proc skip_inline_frame_tests {} {
# inlined functions. Requires get_compiler_info and get_debug_format.
proc skip_inline_var_tests {} {
# GDB only recognizes inlining information in DWARF 2 (DWARF 3).
if { ! [test_debug_format "DWARF 2"] } {
# GDB only recognizes inlining information in DWARF.
if { ! [test_debug_format "DWARF \[0-9\]"] } {
return 1
}