diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/jit-elf-so.exp | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/jit-elf.exp | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/jit-reader.exp | 8 |
4 files changed, 26 insertions, 8 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ec6878f..21839c7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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 diff --git a/gdb/testsuite/gdb.base/jit-elf-so.exp b/gdb/testsuite/gdb.base/jit-elf-so.exp index 51c1d33..193d330 100644 --- a/gdb/testsuite/gdb.base/jit-elf-so.exp +++ b/gdb/testsuite/gdb.base/jit-elf-so.exp @@ -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" } diff --git a/gdb/testsuite/gdb.base/jit-elf.exp b/gdb/testsuite/gdb.base/jit-elf.exp index 78a19c2..b9c2318 100644 --- a/gdb/testsuite/gdb.base/jit-elf.exp +++ b/gdb/testsuite/gdb.base/jit-elf.exp @@ -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" } diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp index c0af2fc..1821bdc 100644 --- a/gdb/testsuite/gdb.base/jit-reader.exp +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -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" } |