From: Tom de Vries <tdevries@suse.de>
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 [thread overview]
Message-ID: <20230424124846.29580-2-tdevries@suse.de> (raw)
In-Reply-To: <20230424124846.29580-1-tdevries@suse.de>
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 <http://www.gnu.org/licenses/>.
+
+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
next prev parent reply other threads:[~2023-04-24 12:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-24 12:48 [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp Tom de Vries
2023-04-24 12:48 ` Tom de Vries [this message]
2023-04-24 12:48 ` [pushed 3/4] [gdb/testsuite] Fix gdb.multi/multi-arch.exp on powerpc64le Tom de Vries
2023-04-24 12:48 ` [pushed 4/4] [gdb/testsuite] Require GCC >= 5.x.x in gdb.base/utf8-identifiers.exp Tom de Vries
2023-04-24 16:48 ` [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp Tom Tromey
2023-04-24 20:22 ` Tom de Vries
2023-04-25 18:38 ` Tom Tromey
2023-04-26 6:34 ` Tom de Vries
2023-04-26 7:08 ` Andreas Schwab
2023-05-02 15:38 ` Tom de Vries
2023-04-27 13:39 ` Tom Tromey
2023-05-02 15:40 ` Tom de Vries
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230424124846.29580-2-tdevries@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).