From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16357 invoked by alias); 19 Jul 2012 20:03:11 -0000 Received: (qmail 16348 invoked by uid 22791); 19 Jul 2012 20:03:10 -0000 X-SWARE-Spam-Status: No, hits=-7.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 19 Jul 2012 20:02:45 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6JK2inS014666 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 Jul 2012 16:02:44 -0400 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6JK2hCn012577; Thu, 19 Jul 2012 16:02:43 -0400 Message-ID: <500867E2.5070509@redhat.com> Date: Thu, 19 Jul 2012 20:03:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120615 Thunderbird/13.0.1 MIME-Version: 1.0 To: Pedro Alves CC: Tom Tromey , gdb-patches@sourceware.org Subject: cleanup some fors in the testsuite (was: Re: [PATCH] sigall.exp and friends: centralize signals list.) References: <20120719143526.8328.28449.stgit@brno.lan> <87zk6vy88i.fsf@fleche.redhat.com> <500844E7.4040103@redhat.com> <87sjcny313.fsf@fleche.redhat.com> <5008645A.4010601@redhat.com> In-Reply-To: <5008645A.4010601@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-07/txt/msg00376.txt.bz2 On 07/19/2012 08:47 PM, Pedro Alves wrote: > On 07/19/2012 08:16 PM, Tom Tromey wrote: >>>>>>> "Pedro" == Pedro Alves writes: >> >> Pedro> - We really want to skip the first signal, because that's >> Pedro> handled before the loop. It doesn't matter which signal it is. >> Pedro> So I concluded that not hard coding a signal name was a little >> Pedro> better, and went with a for with index, which expresses the idea >> Pedro> naturally. >> >> Alternatively you can use [lrange $signals 1 end] > > Or even: > > for {set i 1} {$i < [llength $signals]} {incr i} { > > which in hindsight, I have no idea why I didn't do it like that, over a > silly "if i==0 continue". :-P > > I'll use lrange. I've applied this. Thanks! 2012-07-19 Pedro Alves * config/monitor.exp (gdb_load): Remove redundant ';' in for loop. * config/vx.exp (gdb_start): Likewise. * gdb.base/printcmds.exp (test_print_repeats_10): Likewise. * gdb.base/setvar.exp (test_set): Likewise. * gdb.base/sigall.exp: Use foreach+lrange instead of for+continue. * gdb.reverse/sigall-precsave.exp: Likewise. * gdb.reverse/sigall-reverse.exp: Likewise. --- gdb/testsuite/config/monitor.exp | 2 +- gdb/testsuite/config/vx.exp | 2 +- gdb/testsuite/gdb.base/printcmds.exp | 4 ++-- gdb/testsuite/gdb.base/setvar.exp | 2 +- gdb/testsuite/gdb.base/sigall.exp | 8 +------- gdb/testsuite/gdb.reverse/sigall-precsave.exp | 16 ++-------------- gdb/testsuite/gdb.reverse/sigall-reverse.exp | 16 ++-------------- 7 files changed, 10 insertions(+), 40 deletions(-) diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp index a40911d..361926b 100644 --- a/gdb/testsuite/config/monitor.exp +++ b/gdb/testsuite/config/monitor.exp @@ -159,7 +159,7 @@ proc gdb_load { arg } { set last_gdb_file $arg; - for { set j 1; } { $j <= 2 } {incr j; } { + for { set j 1 } { $j <= 2 } {incr j } { if [target_info exists gdb,use_standard_load] { gdb_target_exec; if ![target_info exists gdb,no_push_conn] { diff --git a/gdb/testsuite/config/vx.exp b/gdb/testsuite/config/vx.exp index 335287f..29c3b1b 100644 --- a/gdb/testsuite/config/vx.exp +++ b/gdb/testsuite/config/vx.exp @@ -59,7 +59,7 @@ proc gdb_start { } { global reboot # get a connection to the board - for { set x 0; } { $x < 3 } { incr x } { + for { set x 0 } { $x < 3 } { incr x } { set shell_id [remote_open target] if { $shell_id > 0 } { verbose "Spawn id for remote shell is $shell_id" diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp index 993162e..4f76cec 100644 --- a/gdb/testsuite/gdb.base/printcmds.exp +++ b/gdb/testsuite/gdb.base/printcmds.exp @@ -424,9 +424,9 @@ proc test_print_all_chars {} { proc test_print_repeats_10 {} { global gdb_prompt decimal - for { set x 1; } { $x <= 16 } { incr x; } { + for { set x 1 } { $x <= 16 } { incr x } { gdb_test_no_output "set print elements $x" - for { set e 1; } { $e <= 16 } {incr e; } { + for { set e 1 } { $e <= 16 } {incr e } { set v [expr $e - 1]; set command "p &ctable2\[${v}*16\]" if { $x < $e } { diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp index 870d043..7faa10a 100644 --- a/gdb/testsuite/gdb.base/setvar.exp +++ b/gdb/testsuite/gdb.base/setvar.exp @@ -77,7 +77,7 @@ proc test_set { args } { set count 1; # Set up the variables. - for {set x 0;} {$x < $length} {incr x;} { + for {set x 0} {$x < $length} {incr x} { if { "[lindex $args $x]" != "" } { set arg [lindex $args $x]; if { ($x == $final) || ([string first ".*" [lindex $args [expr $x + 1]]] >= 0) } { diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp index 7963504..5084f22 100644 --- a/gdb/testsuite/gdb.base/sigall.exp +++ b/gdb/testsuite/gdb.base/sigall.exp @@ -182,13 +182,7 @@ set thissig "ABRT" runto gen_ABRT -for {set i 0;} {$i < [llength $signals]} {incr i;} { - # Skip the first. - if { $i == 0 } { - continue - } - - set sig [lindex $signals $i] +foreach sig [lrange $signals 1 end] { test_one_sig $sig } diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp index ee3240b..d0d68a6 100644 --- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp +++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp @@ -300,13 +300,7 @@ set sig_supported 1 set thissig "ABRT" # test signal handling -for {set i 0;} {$i < [llength $signals]} {incr i;} { - # Skip the first. - if { $i == 0 } { - continue - } - - set sig [lindex $signals $i] +foreach sig [lrange $signals 1 end] { test_one_sig $sig } @@ -330,12 +324,6 @@ foreach sig [lreverse $signals] { set sig_supported 1 set thissig "ABRT" -for {set i 0;} {$i < [llength $signals]} {incr i;} { - # Skip the first. - if { $i == 0 } { - continue - } - - set sig [lindex $signals $i] +foreach sig [lrange $signals 1 end] { test_one_sig $sig } diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp index f5bbe1e..3d516ac 100644 --- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp +++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp @@ -248,13 +248,7 @@ set sig_supported 1 set thissig "ABRT" # test signal handling -for {set i 0;} {$i < [llength $signals]} {incr i;} { - # Skip the first. - if { $i == 0 } { - continue - } - - set sig [lindex $signals $i] +foreach sig [lrange $signals 1 end] { test_one_sig $sig } @@ -280,12 +274,6 @@ foreach sig [lreverse $signals] { set sig_supported 1 set thissig "ABRT" -for {set i 0;} {$i < [llength $signals]} {incr i;} { - # Skip the first. - if { $i == 0 } { - continue - } - - set sig [lindex $signals $i] +foreach sig [lrange $signals 1 end] { test_one_sig $sig }