From 3608f86c427a907335eb96b8dd6d6d2071d6f4a1 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 27 Feb 2020 14:27:09 +0100 Subject: [PATCH] [gdb/testsuite] Remove unused globals Remove unused global variable declarations. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-02-27 Tom de Vries * config/sid.exp: Remove unused globals. * gdb.base/attach.exp: Same. * gdb.base/catch-load.exp: Same. * gdb.base/dbx.exp: Same. * lib/gdb.exp: Same. * lib/mi-support.exp: Same. * lib/prompt.exp: Same. --- gdb/testsuite/ChangeLog | 10 ++++++++++ gdb/testsuite/config/sid.exp | 2 -- gdb/testsuite/gdb.base/attach.exp | 10 ---------- gdb/testsuite/gdb.base/catch-load.exp | 3 +-- gdb/testsuite/gdb.base/dbx.exp | 2 -- gdb/testsuite/lib/gdb.exp | 4 ---- gdb/testsuite/lib/mi-support.exp | 5 +---- gdb/testsuite/lib/prompt.exp | 1 - 8 files changed, 12 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2f5ab91bf88..d5798bd394c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2020-02-27 Tom de Vries + + * config/sid.exp: Remove unused globals. + * gdb.base/attach.exp: Same. + * gdb.base/catch-load.exp: Same. + * gdb.base/dbx.exp: Same. + * lib/gdb.exp: Same. + * lib/mi-support.exp: Same. + * lib/prompt.exp: Same. + 2020-02-27 Tom de Vries * lib/tuiterm.exp (spawn): Handle case that spawn_out(slave,name) is diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp index ec2f4430f21..5e79823675c 100644 --- a/gdb/testsuite/config/sid.exp +++ b/gdb/testsuite/config/sid.exp @@ -15,8 +15,6 @@ # along with this program. If not, see . proc sid_start {} { - global verbose - set port [lindex [split [target_info netport] ":"] 1] # Set a default endianness diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp index 5a1d7a84736..32f72e2a9a2 100644 --- a/gdb/testsuite/gdb.base/attach.exp +++ b/gdb/testsuite/gdb.base/attach.exp @@ -53,10 +53,6 @@ proc_with_prefix do_attach_failure_tests {} { global binfile global escapedbinfile global srcfile - global testfile - global subdir - global timeout - global decimal clean_restart $binfile @@ -205,8 +201,6 @@ proc_with_prefix do_attach_tests {} { global binfile global escapedbinfile global srcfile - global testfile - global subdir global timeout global decimal @@ -439,10 +433,6 @@ proc_with_prefix do_call_attach_tests {} { proc_with_prefix do_command_attach_tests {} { global gdb_prompt global binfile - global verbose - global GDB - global INTERNAL_GDBFLAGS - global GDBFLAGS if ![isnative] then { unsupported "command attach test" diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp index 62b43c801dd..17389e53b85 100644 --- a/gdb/testsuite/gdb.base/catch-load.exp +++ b/gdb/testsuite/gdb.base/catch-load.exp @@ -46,8 +46,7 @@ if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] ! # MATCH is a boolean saying whether we expect the catchpoint to be hit. proc one_catch_load_test {scenario kind match sostop} { with_test_prefix "${scenario}" { - global verbose testfile testfile2 binfile2 binfile2_dlopen - global srcfile + global testfile testfile2 binfile2 binfile2_dlopen global decimal gdb_prompt clean_restart $testfile diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index d911fedf92c..4299c44368c 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -26,7 +26,6 @@ if {[build_executable $testfile.exp $testfile \ # start gdb -- start gdb running, default procedure # proc dbx_gdb_start { } { - global verbose global GDB global INTERNAL_GDBFLAGS GDBFLAGS global prompt @@ -153,7 +152,6 @@ set old_gdb_file_cmd_args [info args gdb_file_cmd] set old_gdb_file_cmd_body [info body gdb_file_cmd] proc gdb_file_cmd {arg} { - global verbose global loadpath global loadfile global GDB diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 81518b9646a..26795d01523 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -159,7 +159,6 @@ proc gdb_version { } { # proc gdb_unload {} { - global verbose global GDB global gdb_prompt send_gdb "file\n" @@ -1617,7 +1616,6 @@ proc gdb_reinitialize_dir { subdir } { proc default_gdb_exit {} { global GDB global INTERNAL_GDBFLAGS GDBFLAGS - global verbose global gdb_spawn_id inferior_spawn_id global inotify_log_file @@ -1683,7 +1681,6 @@ proc default_gdb_exit {} { proc gdb_file_cmd { arg } { global gdb_prompt - global verbose global GDB global last_loaded_file @@ -5131,7 +5128,6 @@ set debug_format "unknown" proc get_debug_format { } { global gdb_prompt - global verbose global expect_out global debug_format diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 2c67cc287dc..1e59919ab47 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -55,7 +55,6 @@ proc mi_gdb_exit {} { proc mi_uncatched_gdb_exit {} { global GDB global INTERNAL_GDBFLAGS GDBFLAGS - global verbose global gdb_spawn_id gdb_main_spawn_id global mi_spawn_id inferior_spawn_id global gdb_prompt @@ -185,7 +184,7 @@ proc mi_gdb_start_separate_mi_tty { args } { # get really slow. Give gdb at least 3 minutes to start up. # proc default_mi_gdb_start { args } { - global verbose use_gdb_stub + global use_gdb_stub global GDB global INTERNAL_GDBFLAGS GDBFLAGS global gdb_prompt @@ -482,7 +481,6 @@ proc mi_gdb_target_cmd { targetname serialport } { # return a -1 if anything goes wrong. # proc mi_gdb_file_cmd { arg } { - global verbose global loadpath global loadfile global GDB @@ -553,7 +551,6 @@ proc mi_gdb_file_cmd { arg } { # return a -1 if anything goes wrong. # proc mi_gdb_target_load { } { - global verbose global loadpath global loadfile global GDB diff --git a/gdb/testsuite/lib/prompt.exp b/gdb/testsuite/lib/prompt.exp index f161fc7d275..c7882b4fb42 100644 --- a/gdb/testsuite/lib/prompt.exp +++ b/gdb/testsuite/lib/prompt.exp @@ -24,7 +24,6 @@ # uses pass if it sees $gdb_prompt, and fail if it sees $gdb_prompt_fail. # proc default_prompt_gdb_start { } { - global verbose global GDB global INTERNAL_GDBFLAGS GDBFLAGS global gdb_prompt -- 2.30.2