From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id GOtSBFOrTWESNAAAWB0awg (envelope-from ) for ; Fri, 24 Sep 2021 06:41:23 -0400 Received: by simark.ca (Postfix, from userid 112) id 100531EE25; Fri, 24 Sep 2021 06:41:23 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 60E571EDDB for ; Fri, 24 Sep 2021 06:41:22 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1A807385801E for ; Fri, 24 Sep 2021 10:41:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1A807385801E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1632480082; bh=gjUWtQruu8wHaDmqEX/py3/77LEBNmEcawvSkUlSDUY=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Rah4BbyFRh/xCeaJT83SRyfHSjGs8rz3p7KHAoN1uvyMGiz0+AqPx+DQ+Adx0vPiz O/QviXiQNS5Pm0n9SN/Jj+4YkgVVWV17KQiCQTlKaVAgJ3k0b44oUA+ra/dHLcn/+E THVEBhsaVV9sp1eE+SHavuA1EygZ9J2iHP8l3fWg= Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 8496A385842D for ; Fri, 24 Sep 2021 10:40:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8496A385842D Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B7BFD223E0 for ; Fri, 24 Sep 2021 10:40:52 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A67A013E14 for ; Fri, 24 Sep 2021 10:40:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Df6PJzSrTWEXWAAAMHmgww (envelope-from ) for ; Fri, 24 Sep 2021 10:40:52 +0000 Date: Fri, 24 Sep 2021 12:40:51 +0200 To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix set $var val in gdb.dwarf2/dw2-is-stmt.exp Message-ID: <20210924104049.GA1519@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, When doing a testrun with: ... $ make check RUNTESTFLAGS=$(cd $src/gdb/testsuite/; echo gdb.dwarf2/*.exp) ... I ran into: ... ERROR: tcl error sourcing gdb.dwarf2/dw2-is-stmt.exp. ERROR: expected integer but got "dw2-abs-hi-pc-world.c" while executing "incr i" ... The variable i is set in gdb.dwarf2/dw2-abs-hi-pc.exp, and leaks to gdb.dwarf2/dw2-is-stmt.exp. It's not removed by gdb_cleanup_globals because i is set as global variable by runtest.exp, which does: ... for { set i 0 } { $i < $argc } { incr i } { ... at toplevel but forgets to unset the variable. Fix this by removing '$' in front of the variable name when doing set: ... -set $i 0 +set i 0 ... Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix set $var val in gdb.dwarf2/dw2-is-stmt.exp --- gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp index 90f7647cbee..bb0afe1c282 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-is-stmt.exp @@ -188,7 +188,7 @@ runto_main # be a single instruction between line_label_1 and line_label_2, but # we allow for up to 25 (just a random number). -set $i 0 +set i 0 set pc [get_hexadecimal_valueof "\$pc" "NO-PC" \ "get pc before stepi loop at line_label_1"] while { $pc < $ll2 } { @@ -218,7 +218,7 @@ while { $pc < $ll2 } { # Now single instruction step forward until GDB reports a new source # line, at which point we should be at line_label_5. -set $i 0 +set i 0 set pc [get_hexadecimal_valueof "\$pc" "NO-PC" \ "get pc before stepi loop at line_label_2"] while { $pc < $ll5 } {