From patchwork Tue Jul 28 21:08:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 7904 Received: (qmail 62369 invoked by alias); 28 Jul 2015 21:08:10 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 62357 invoked by uid 89); 28 Jul 2015 21:08:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: mail-qk0-f179.google.com Received: from mail-qk0-f179.google.com (HELO mail-qk0-f179.google.com) (209.85.220.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 28 Jul 2015 21:08:09 +0000 Received: by qkdv3 with SMTP id v3so57034738qkd.3 for ; Tue, 28 Jul 2015 14:08:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OPp9i8ZKH8xoUIUMKrnOPOTEXiK/7R1oYJ7KmITORWI=; b=OCj8bZrrMtB05Htmrp1i3NKRzwfltNS2rQ8uE2lBrDWXiHL4aSNzOefWxQkVBsFZM4 gCvF6DYFgxVYszKD2K9gB/xE1qSAcYlQXs1J9F4ujTE1Ij75/18z6L7bv/VAY5kLj2yD eyR+9jvbVvwL4tADiovPLOBfx5+MAQ1AiuGmKBY2PkQZFE8XtBgCu3ZVVU4h9W9gh97L IjGdZ3pjMSbe909IX5kXk145/zqusv2i2fXxFeVFbi2IrlJWA0KGtmxMMlCR+aKfOwtY RF5Qleor7sfg1W6NMChmwsMaf8nNpufv4ntpcMfq0MxqGpJIGTkxop8bRn3KbPr2PEbN P0cg== X-Gm-Message-State: ALoCoQmpgWLQzpjFxdaJBrukdatfSM0KaFcpS1ABlbPifWQ070qcoiY6ft3ydNAYHb+XV8+BOb1d X-Received: by 10.55.42.4 with SMTP id q4mr52548340qkh.60.1438117687340; Tue, 28 Jul 2015 14:08:07 -0700 (PDT) Received: from localhost.localdomain (ool-4353acd8.dyn.optonline.net. [67.83.172.216]) by smtp.gmail.com with ESMTPSA id b196sm12041139qka.14.2015.07.28.14.08.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jul 2015 14:08:06 -0700 (PDT) From: Patrick Palka To: gdb-patches@sourceware.org Cc: Patrick Palka Subject: [PATCH] Clean up batch-preserve-term-settings.exp Date: Tue, 28 Jul 2015 17:08:02 -0400 Message-Id: <1438117682-22449-1-git-send-email-patrick@parcs.ath.cx> 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.base/batch-preserve-term-settings.exp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) 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