mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-13 13:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gdb/testsuite] Fix use of verbose in gdb/jit-*.exp

Browse Source 
When running the gdb/jit-*.exp tests with runtest -v, I get:
...
ERROR: internal buffer is full.
UNRESOLVED: gdb.base/jit-elf-so.exp: one_jit_test-1: maintenance print objfiles
ERROR: internal buffer is full.
UNRESOLVED: gdb.base/jit-elf-so.exp: one_jit_test-2: maintenance print objfiles
ERROR: internal buffer is full.
UNRESOLVED: gdb.base/jit-elf.exp: one_jit_test-1: maintenance print objfiles
ERROR: internal buffer is full.
UNRESOLVED: gdb.base/jit-elf.exp: one_jit_test-2: maintenance print objfiles
ERROR: internal buffer is full.
UNRESOLVED: gdb.base/jit-elf.exp: attach: one_jit_test-2: maintenance print objfiles
ERROR: internal buffer is full.
UNRESOLVED: gdb.base/jit-elf.exp: PIE: one_jit_test-1: maintenance print objfiles
FAIL: gdb.base/jit-reader.exp: jit-reader-load
FAIL: gdb.base/jit-reader.exp: with jit-reader: before mangling: bt works
FAIL: gdb.base/jit-reader.exp: with jit-reader: after mangling: bt works
FAIL: gdb.base/jit-reader.exp: with jit-reader again: jit-reader-load
FAIL: gdb.base/jit-reader.exp: with jit-reader again: bt
...

This is the consequence of the use of global verbose in these tests, which is
used to change the actual test, rather than be more verbose about it.

Fix this by defining a global test_verbose in each test, and using that
instead.

Tested on x86_64-linux using runtest -v.

gdb/testsuite/ChangeLog:

2020-06-03  Tom de Vries  <tdevries@suse.de>

	PR testsuite/25609
	* gdb.base/jit-elf-so.exp: Don't modify testing behaviour based on
	value of global verbose.
	* gdb.base/jit-elf.exp: Same.
	* gdb.base/jit-reader.exp: Same.
This commit is contained in:
Tom de Vries 2020-06-03 17:18:52 +02:00
parent 4ee4189f86
commit 5144dfba28
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2020-06-03 Tom de Vries <tdevries@suse.de>
PR testsuite/25609
* gdb.base/jit-elf-so.exp: Don't modify testing behaviour based on
value of global verbose.
* gdb.base/jit-elf.exp: Same.
* gdb.base/jit-reader.exp: Same.
2020-06-02 Tom de Vries <tdevries@suse.de>
* gdb.dwarf2/multidictionary.exp: Don't use

9
gdb/testsuite/gdb.base/jit-elf-so.exp
View File

@ -28,6 +28,9 @@ if {[get_compiler_info]} {
load_lib jit-elf-helpers.exp
# Increase this to see more detail.
set test_verbose 0
# The "real" main of this test, which loads jit-elf-main
# as a shared library.
set main_loader_basename jit-elf-dlmain
@ -73,7 +76,7 @@ proc compile_jit_dlmain {options} {
proc one_jit_test {solib_binfiles_target match_str} {
set count [llength $solib_binfiles_target]
with_test_prefix "one_jit_test-$count" {
global verbose
global test_verbose
global main_loader_binfile main_loader_srcfile
global main_solib_binfile main_solib_srcfile
@ -81,7 +84,7 @@ proc one_jit_test {solib_binfiles_target match_str} {
gdb_load_shlib $main_solib_binfile
# This is just to help debugging when things fail
if {$verbose > 0} {
if {$test_verbose > 0} {
gdb_test "set debug jit 1"
}
@ -121,7 +124,7 @@ proc one_jit_test {solib_binfiles_target match_str} {
gdb_test "info function jit_function" "$match_str"
# This is just to help debugging when things fail
if {$verbose > 0} {
if {$test_verbose > 0} {
gdb_test "maintenance print objfiles"
gdb_test "maintenance info break"
}

9
gdb/testsuite/gdb.base/jit-elf.exp
View File

@ -25,6 +25,9 @@ if {[get_compiler_info]} {
load_lib jit-elf-helpers.exp
# Increase this to see more detail.
set test_verbose 0
# The main code that loads and registers JIT objects.
set main_basename "jit-elf-main"
set main_srcfile ${srcdir}/${subdir}/${main_basename}.c
@ -82,13 +85,13 @@ proc one_jit_test {jit_solibs_target match_str reattach} {
set count [llength $jit_solibs_target]
with_test_prefix "one_jit_test-$count" {
global verbose
global test_verbose
global main_binfile main_srcfile
clean_restart ${main_binfile}
# This is just to help debugging when things fail
if {$verbose > 0} {
if {$test_verbose > 0} {
gdb_test "set debug jit 1"
}
@ -117,7 +120,7 @@ proc one_jit_test {jit_solibs_target match_str reattach} {
gdb_test "info function ^jit_function" "$match_str"
# This is just to help debugging when things fail
if {$verbose > 0} {
if {$test_verbose > 0} {
gdb_test "maintenance print objfiles"
gdb_test "maintenance info break"
}

8
gdb/testsuite/gdb.base/jit-reader.exp
View File

@ -32,6 +32,10 @@ if {[get_compiler_info]} {
return 1
}
# Increase this to see more detail.
set test_verbose 0
set jit_host_src $srcfile
set jit_host_bin $binfile
@ -104,7 +108,7 @@ proc info_registers_current_frame {sp} {
proc jit_reader_test {} {
global jit_host_bin
global jit_reader_bin
global verbose
global test_verbose
global hex decimal
set any "\[^\r\n\]*"
@ -112,7 +116,7 @@ proc jit_reader_test {} {
clean_restart $jit_host_bin
gdb_load_shlib $jit_reader_bin
if {$verbose > 0} {
if {$test_verbose > 0} {
gdb_test_no_output "set debug jit 1"
}