From patchwork Wed Aug 12 13:08:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 8150 Received: (qmail 87502 invoked by alias); 12 Aug 2015 13:08:54 -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 87492 invoked by uid 89); 12 Aug 2015 13:08:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.4 required=5.0 tests=AWL, BAYES_40, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 12 Aug 2015 13:08:53 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 0E5534C09E; Wed, 12 Aug 2015 13:08:52 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t7CD8ox0021931; Wed, 12 Aug 2015 09:08:51 -0400 Message-ID: <55CB4562.9040805@redhat.com> Date: Wed, 12 Aug 2015 14:08:50 +0100 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Patrick Palka , gdb-patches@sourceware.org Subject: Re: [PATCH] Use save_vars to replace existing manipulation of globals in tests References: <1439383627-22886-1-git-send-email-patrick@parcs.ath.cx> In-Reply-To: <1439383627-22886-1-git-send-email-patrick@parcs.ath.cx> On 08/12/2015 01:47 PM, Patrick Palka wrote: > [ The diff is rather ugly for what amounts to relatively simple changes :( ] Yeah, a git diff -w clearly shows how the real change is very simple. Since I did that locally, I pasted it below too. > gdb/testsuite/ChangeLog: > > * gdb.base/gdbhistsize-history.exp > (test_histsize_history_setting): Use save_vars. > * gdb.base/gdbinit-history.exp (test_gdbinit_history_setting): > Use save_vars. > (test_no_truncation_of_unlimited_history_file): Use save_vars. > * gdb.base/readline.exp: Use save_vars. OK. diff --git c/gdb/testsuite/gdb.base/gdbhistsize-history.exp w/gdb/testsuite/gdb.base/gdbhistsize-history.exp index 0c3f93f..75d98e1 100644 --- c/gdb/testsuite/gdb.base/gdbhistsize-history.exp +++ w/gdb/testsuite/gdb.base/gdbhistsize-history.exp @@ -24,11 +24,7 @@ proc test_histsize_history_setting { histsize size { env_var "GDBHISTSIZE" } } { global env - set have_old_gdbhistsize 0 - if [info exists env($env_var)] { - set have_old_gdbhistsize 1 - set old_gdbhistsize $env($env_var) - } + save_vars { env($env_var) } { set env($env_var) $histsize with_test_prefix "histsize=$histsize" { @@ -43,11 +39,6 @@ proc test_histsize_history_setting { histsize size { env_var "GDBHISTSIZE" } } { gdb_test "show commands" \ " . show history size\r\n . show commands" } - - if { $have_old_gdbhistsize } { - set env($env_var) $old_gdbhistsize - } else { - unset env($env_var) } } } diff --git c/gdb/testsuite/gdb.base/gdbinit-history.exp w/gdb/testsuite/gdb.base/gdbinit-history.exp index 85177f3..85ef12f 100644 --- c/gdb/testsuite/gdb.base/gdbinit-history.exp +++ w/gdb/testsuite/gdb.base/gdbinit-history.exp @@ -28,8 +28,7 @@ proc test_gdbinit_history_setting { home size { gdbhistsize_val "-" } } { global srcdir global subdir - array set old_env [array get env] - + save_vars { INTERNAL_GDBFLAGS env(GDBHISTSIZE) env(HOME) } { set env(HOME) "$srcdir/$subdir/$home" # The GDBHISTSIZE environment variable takes precedence over whatever @@ -41,7 +40,6 @@ proc test_gdbinit_history_setting { home size { gdbhistsize_val "-" } } { set env(GDBHISTSIZE) $gdbhistsize_val } - set saved_internal_gdbflags $INTERNAL_GDBFLAGS set INTERNAL_GDBFLAGS [string map {"-nx" ""} $INTERNAL_GDBFLAGS] set prefix "home=$home" @@ -61,11 +59,7 @@ proc test_gdbinit_history_setting { home size { gdbhistsize_val "-" } } { gdb_test "show commands" " . show history size\r\n . show commands" } } - - set INTERNAL_GDBFLAGS $saved_internal_gdbflags - - unset -nocomplain env(GDBHISTSIZE) - array set env [array get old_env] + } } # Check that the history file does not get truncated to zero when a gdbinit @@ -75,15 +69,12 @@ proc test_no_truncation_of_unlimited_history_file { } { global env global INTERNAL_GDBFLAGS - array set old_env [array get env] - + save_vars { INTERNAL_GDBFLAGS env(GDBHISTSIZE) } { # The GDBHISTSIZE environment variable takes precedence over whatever # history size is set in .gdbinit. Make sure the former is not # set. unset -nocomplain env(GDBHISTSIZE) - set saved_internal_gdbflags $INTERNAL_GDBFLAGS - set temp_gdbinit [standard_output_file "gdbinit-history.gdbinit"] set temp_histfile [standard_output_file "gdbinit-history.gdb_history"] file delete $temp_gdbinit @@ -118,10 +109,7 @@ proc test_no_truncation_of_unlimited_history_file { } { gdb_test "server show commands" " . print 1.*" } } - - set INTERNAL_GDBFLAGS $saved_internal_gdbflags - - array set env [array get old_env] + } } test_gdbinit_history_setting "gdbinit-history/unlimited" "unlimited" diff --git c/gdb/testsuite/gdb.base/readline.exp w/gdb/testsuite/gdb.base/readline.exp index f0490a2..a605c80 100644 --- c/gdb/testsuite/gdb.base/readline.exp +++ w/gdb/testsuite/gdb.base/readline.exp @@ -150,10 +150,9 @@ if { ![readline_is_used] } { return -1 } -set oldtimeout1 $timeout +save_vars { timeout env(GDBHISTSIZE) env(GDBHISTFILE) } { set timeout 30 - # A simple test of operate-and-get-next. operate_and_get_next "Simple operate-and-get-next" \ "p 1" ".* = 1" \ @@ -182,12 +181,6 @@ gdb_test_multiple "if 1 > 0\n\033\[A\033\[A\nend" $msg { # Now repeat the first test with a history file that fills the entire # history list. -if [info exists env(GDBHISTFILE)] { - set old_gdbhistfile $env(GDBHISTFILE) -} -if [info exists env(GDBHISTSIZE)] { - set old_gdbhistsize $env(GDBHISTSIZE) -} set env(GDBHISTFILE) "${srcdir}/${subdir}/gdb_history" set env(GDBHISTSIZE) "10" @@ -199,19 +192,6 @@ operate_and_get_next "Simple operate-and-get-next" \ "p 7" ".* = 7" \ "p 8" ".* = 8" \ "p 9" ".* = 9" - - -# Restore globals modified in this test... -if [info exists old_gdbhistfile] { - set env(GDBHISTFILE) $old_gdbhistfile -} else { - unset env(GDBHISTFILE) -} -if [info exists old_gdbhistsize] { - set env(GDBHISTSIZE) $old_gdbhistsize -} else { - unset env(GDBHISTSIZE) } -set timeout $oldtimeout1 return 0