From 90074d118de70c5eb2c71ba83e58d96359149d79 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Mon, 27 Jul 2015 22:10:13 -0400 Subject: [PATCH] Clean up batch-preserve-term-settings.exp See ChangeLog for details. No functional change intended. Tested on x86_64 Debian Stretch by verifying that the gdb.log output remains unchanged for native, gdbserver and extended-gdbserver. gdb/testsuite/ChangeLog: * gdb.base/batch-preserve-term-settings.exp: Remove top-level manipulation of saved_gdbflags. (test_terminal_settings_preserved): Remove global declaration of the unused variable pagination_prompt. Remove manipulation of saved_gdbflags. Use a local variable EXTRA_GDBFLAGS instead of GDBFLAGS. --- gdb/testsuite/ChangeLog | 9 +++++++++ .../gdb.base/batch-preserve-term-settings.exp | 19 ++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0f8de61..6fd5a36 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2015-07-29 Patrick Palka + + * gdb.base/batch-preserve-term-settings.exp: Remove top-level + manipulation of saved_gdbflags. + (test_terminal_settings_preserved): Remove global declaration of + the unused variable pagination_prompt. Remove manipulation of + saved_gdbflags. Use a local variable EXTRA_GDBFLAGS instead of + GDBFLAGS. + 2015-07-29 Pedro Alves * boards/gdbserver-base.exp: Don't set gdb,noinferiorio. diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp index 834e7a9..97ffaa4 100644 --- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp +++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp @@ -27,9 +27,6 @@ if [is_remote host] { set file_arg [remote_download host $file_arg] } -global GDBFLAGS -set saved_gdbflags $GDBFLAGS - # The shell's prompt. set shell_prompt "$ " set shell_prompt_re [string_to_regexp $shell_prompt] @@ -119,8 +116,7 @@ proc run_stty {message result} { proc test_terminal_settings_preserved {} { global file_arg global GDB INTERNAL_GDBFLAGS GDBFLAGS - global gdb_prompt pagination_prompt - global saved_gdbflags + global gdb_prompt global shell_prompt_re if ![spawn_shell] { @@ -130,12 +126,11 @@ proc test_terminal_settings_preserved {} { set stty_supported [run_stty "stty before" stty_before] set test "gdb -batch -ex run" - set GDBFLAGS $saved_gdbflags - append GDBFLAGS " -batch" - append GDBFLAGS " -ex \"set height unlimited\"" - append GDBFLAGS " -ex \"start\"" - append GDBFLAGS " --args \"$file_arg\"" - send_gdb "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS [host_info gdb_opts]\n" + append EXTRA_GDBFLAGS "-batch" + append EXTRA_GDBFLAGS " -ex \"set height unlimited\"" + append EXTRA_GDBFLAGS " -ex \"start\"" + append EXTRA_GDBFLAGS " --args \"$file_arg\"" + send_gdb "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS $EXTRA_GDBFLAGS [host_info gdb_opts]\n" gdb_expect { -re "Don't know how to run.*$shell_prompt_re$" { unsupported $test @@ -182,5 +177,3 @@ proc test_terminal_settings_preserved {} { } test_terminal_settings_preserved - -set GDBFLAGS $saved_gdbflags -- 2.7.4