From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 5C3533858D3C for ; Mon, 24 Apr 2023 12:48:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5C3533858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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 8CE9D21A84 for ; Mon, 24 Apr 2023 12:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682340525; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i6S/hJL9knwQha6Y7bs54pu4LtEC+i8yBqElwTTYUN0=; b=lbwcwyj65qo5hPF8sDSYZ53sBu1hr+1NGt7e0d1FUOPhUuWQ3/KM74Nai1wnsuOX1mWOYR kCGMNRiVkE8WW16xt+ThLxfEGKG7zV9M0Smro/JST3BfSnQHDjhLA2r9xIaHpjmJNW3WZe ZtRVgHnS2oaFWk0StO2o7FXqDJfEcPw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682340525; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i6S/hJL9knwQha6Y7bs54pu4LtEC+i8yBqElwTTYUN0=; b=fv+4m42WKCjjmkbDipzSBLfAvhgVY2RvCjb8Jjrvk4yRJWy6ALM1M9HooPxfQ0XePGLc/G 9aHxHxV25G0SRkCQ== 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 79C7B1390E for ; Mon, 24 Apr 2023 12:48:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +KMpHK16RmRdBAAAMHmgww (envelope-from ) for ; Mon, 24 Apr 2023 12:48:45 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed 2/4] [gdb/testsuite] Add basic lmap for tcl < 8.6 Date: Mon, 24 Apr 2023 14:48:44 +0200 Message-Id: <20230424124846.29580-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230424124846.29580-1-tdevries@suse.de> References: <20230424124846.29580-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: With test-case gdb.dwarf2/dw2-abs-hi-pc.exp and tcl 8.5, I run into: ... ERROR: tcl error sourcing gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp. ERROR: invalid command name "lmap" while executing "::gdb_tcl_unknown lmap i {dw2-abs-hi-pc.c dw2-abs-hi-pc-hello.c \ dw2-abs-hi-pc-world.c} { expr { "$srcdir/$subdir/$i" } }" ... Fix this by adding basic lmap support for tcl version < 8.6. Tested on x86_64-linux. --- gdb/testsuite/gdb.testsuite/lmap.exp | 20 ++++++++++++++++++++ gdb/testsuite/lib/gdb.exp | 15 +++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 gdb/testsuite/gdb.testsuite/lmap.exp diff --git a/gdb/testsuite/gdb.testsuite/lmap.exp b/gdb/testsuite/gdb.testsuite/lmap.exp new file mode 100644 index 00000000000..501e18bdd92 --- /dev/null +++ b/gdb/testsuite/gdb.testsuite/lmap.exp @@ -0,0 +1,20 @@ +# Copyright 2023 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set one 1 +set l1 { $one 2 } +set res1 [lmap item $l1 {expr $item + 1}] +gdb_assert { [lindex $res1 0] == 2 } +gdb_assert { [lindex $res1 1] == 3 } +gdb_assert { $item == 2 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index b59b4358ca4..9d711e8aa66 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1516,6 +1516,21 @@ if { [tcl_version_at_least 8 5] == 0 } { } } +if { [tcl_version_at_least 8 6] == 0 } { + # lmap was added in tcl 8.6. Only add if missing. + + # Note that we only implement the simple variant for now. + proc lmap { varname list body } { + set res {} + foreach val $list { + uplevel 1 "set $varname $val" + lappend res [uplevel 1 $body] + } + + return $res + } +} + # gdb_test_no_output [-prompt PROMPT_REGEXP] [-nopass] COMMAND [MESSAGE] # Send a command to GDB and verify that this command generated no output. # -- 2.35.3