[pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Tom de Vries]

Test-case gdb.dwarf2/dw2-abs-hi-pc.exp uses string cat:
...
set sources [lmap i $sources { string cat "${srcdir}/${subdir}/" $i }]
...
but that's only supported starting tcl 8.6.

Fix this by using "expr" instead:
...
set sources [lmap i $sources { expr { "$srcdir/$subdir/$i" } }]
...

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp b/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
index 0868b69f15e..2ea6a5cea00 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
@@ -24,7 +24,8 @@ set sources \
 	 ${testfile}.c \
 	 ${testfile}-hello.c \
 	 ${testfile}-world.c]
-set sources [lmap i $sources { string cat "${srcdir}/${subdir}/" $i }]
+set sources [lmap i $sources { expr { "$srcdir/$subdir/$i" } }]
+
 lassign [function_range hello $sources] \
     hello_start hello_len
 lassign [function_range world $sources] \

base-commit: ea5c591c023544e40bb4967314a47d8e6a1e806d
-- 
2.35.3

[pushed 2/4] [gdb/testsuite] Add basic lmap for tcl < 8.6

[Tom de Vries]

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

[pushed 3/4] [gdb/testsuite] Fix gdb.multi/multi-arch.exp on powerpc64le

[Tom de Vries]

When running test-case gdb.multi/multi-arch.exp on powerpc64le-linux, I run into:
...
Running gdb/testsuite/gdb.multi/multi-arch.exp ...
gdb compile failed, In file included from /usr/include/features.h:399:0,
                 from /usr/include/stdio.h:27,
                 from gdb/testsuite/gdb.multi/hangout.c:18:
/usr/include/gnu/stubs.h:8:27: fatal error: gnu/stubs-32.h: \
  No such file or directory
 # include <gnu/stubs-32.h>
                           ^
compilation terminated.
...

The problem is that the test-case attempts to use gcc -m32 to produce an
executable while that's not available.

Fix this by:
- introduce a new caching proc have_compile_and_link_flag, and
- using have_compile_and_link_flag in test-case gdb.multi/multi-arch.exp.

Tested on:
- x86_64-linux (openSUSE Leap 15.4), and
- powerpc64le-linux (CentOS-7).
---
 gdb/testsuite/gdb.multi/multi-arch.exp | 8 ++++++++
 gdb/testsuite/lib/gdb.exp              | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/gdb/testsuite/gdb.multi/multi-arch.exp b/gdb/testsuite/gdb.multi/multi-arch.exp
index f2c8a282a61..e1fbe1bcab1 100644
--- a/gdb/testsuite/gdb.multi/multi-arch.exp
+++ b/gdb/testsuite/gdb.multi/multi-arch.exp
@@ -50,6 +50,14 @@ if [istarget "s390*-*-*"] {
     set march2 "-m32"
 }
 
+if { $march1 != "" } {
+    require "have_compile_and_link_flag $march1"
+}
+
+if { $march2 != "" } {
+    require "have_compile_and_link_flag $march2"
+}
+
 if { [build_executable "failed to prepare" ${exec1} "${srcfile1}" \
 	  [list debug additional_flags=${march1}]] } {
     return -1
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 9d711e8aa66..45588d85aea 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -9668,6 +9668,14 @@ gdb_caching_proc have_compile_flag { flag } {
 		additional_flags=$flag]
 }
 
+# Return 1 if we can create an executable using compile and link flag FLAG.
+
+gdb_caching_proc have_compile_and_link_flag { flag } {
+    set src { int main () { return 0; } }
+    return [gdb_can_simple_compile have_compile_and_link_flag_$flag $src executable \
+		additional_flags=$flag]
+}
+
 # Handle include file $srcdir/$subdir/FILE.
 
 proc include_file { file } {
-- 
2.35.3

[pushed 4/4] [gdb/testsuite] Require GCC >= 5.x.x in gdb.base/utf8-identifiers.exp

[Tom de Vries]

Test-case gdb.base/utf8-identifiers.exp compiles starting with GCC 5, so
require this.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.base/utf8-identifiers.exp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdb/testsuite/gdb.base/utf8-identifiers.exp b/gdb/testsuite/gdb.base/utf8-identifiers.exp
index a6ef80fb0bd..48dce3cdc11 100644
--- a/gdb/testsuite/gdb.base/utf8-identifiers.exp
+++ b/gdb/testsuite/gdb.base/utf8-identifiers.exp
@@ -21,6 +21,11 @@
 
 load_lib completion-support.exp
 
+if { [is_c_compiler_gcc] } {
+    # Gcc fully supports fextended-identifiers starting GCC 5.
+    require {expr [gcc_major_version] >= 5}
+}
+
 standard_testfile
 
 # Enable basic use of UTF-8.  LC_ALL gets reset for each testfile.
-- 
2.35.3

Re: [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Tom Tromey]

>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:

Tom> Fix this by using "expr" instead:
Tom> ...
Tom> set sources [lmap i $sources { expr { "$srcdir/$subdir/$i" } }]

expr seems very weird here, since it's normally used for evaluating an
expression.

Maybe subst would be a more idiomatic choice, if it works.

Tom

Re: [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Tom de Vries]

On 4/24/23 18:48, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> Tom> Fix this by using "expr" instead:
> Tom> ...
> Tom> set sources [lmap i $sources { expr { "$srcdir/$subdir/$i" } }]
> 
> expr seems very weird here, since it's normally used for evaluating an
> expression.

I got the idea from here ( 
https://stackoverflow.com/questions/30489106/using-lmap-to-filter-list-of-strings 
).

> Maybe subst would be a more idiomatic choice, if it works.

It does, indeed:
...
-set sources [lmap i $sources { expr { "$srcdir/$subdir/$i" } }]
+set sources [lmap i $sources { subst $srcdir/$subdir/$i }]
...

My working set of tcl is a bit random, so I don't know what idiomatic is 
and what not.

I agree that subst is neater since it needs less quoting.

Thanks,
- Tom

Re: [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Tom Tromey]

>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:

Tom> +set sources [lmap i $sources { subst $srcdir/$subdir/$i }]

Tom> My working set of tcl is a bit random, so I don't know what idiomatic
Tom> is and what not.

No worries, Tcl expertise isn't exactly a headline skill.

Tom> I agree that subst is neater since it needs less quoting.

It probably has to be { subst { $srcdir/$subdir/$i } }
since otherwise there will be a second substitution if, say, the srcdir
has a $ or [] in it.

Tom

Re: [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Tom de Vries]

On 4/25/23 20:38, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> Tom> +set sources [lmap i $sources { subst $srcdir/$subdir/$i }]
> 
> Tom> My working set of tcl is a bit random, so I don't know what idiomatic
> Tom> is and what not.
> 
> No worries, Tcl expertise isn't exactly a headline skill.
> 
> Tom> I agree that subst is neater since it needs less quoting.
> 
> It probably has to be { subst { $srcdir/$subdir/$i } }
> since otherwise there will be a second substitution if, say, the srcdir
> has a $ or [] in it.

OK, let's try an example.

We currently have this style:
...
set b d
set l { a $b }
set res [lmap v $l { expr {"$v/c"} }]
foreach v $res {
     puts "V: $v"
}
...
which does:
...
V: a/c
V: $b/c
...

Then with subst we have the same:
...
set res [lmap v $l { subst {$v/c} }]
...
unless we forget the quoting:
...
set res [lmap v $l { subst $v/c }]
...
which gets us instead:
...
V: a/c
V: d/c
...

Hmm, in that case I think subst is the worse choice.  With expr, things 
either parse or not, and if it parses you get the right result.

FWIW, reading a bit more about it I get the impression also set is 
idiomatic, so I came up with this:
...
set res [lmap v $l { set v $v/c ; set v }]
...
which works as well.

Thanks,
- Tom

Re: [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Andreas Schwab]

On Apr 26 2023, Tom de Vries via Gdb-patches wrote:

> FWIW, reading a bit more about it I get the impression also set is
> idiomatic, so I came up with this:
> ...
> set res [lmap v $l { set v $v/c ; set v }]
> ...
> which works as well.

You won't need the second set, though, since the first set already
returns the assigned value.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

Re: [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Tom de Vries]

[-- Attachment #1: Type: text/plain, Size: 467 bytes --]

On 4/26/23 09:08, Andreas Schwab wrote:
> On Apr 26 2023, Tom de Vries via Gdb-patches wrote:
> 
>> FWIW, reading a bit more about it I get the impression also set is
>> idiomatic, so I came up with this:
>> ...
>> set res [lmap v $l { set v $v/c ; set v }]
>> ...
>> which works as well.
> 
> You won't need the second set, though, since the first set already
> returns the assigned value.
> 

Andreas, thanks for the review.

Committed as attached.

Thanks,
- Tom


[-- Attachment #2: 0001-gdb-testsuite-Use-set-in-lmap-in-gdb.dwarf2-dw2-abs-.patch --]
[-- Type: text/x-patch, Size: 1270 bytes --]

From 2cef3ed1040d4f5191fbc53ebc82fdb3a635f7d1 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Tue, 2 May 2023 17:28:50 +0200
Subject: [pushed] [gdb/testsuite] Use set in lmap in
 gdb.dwarf2/dw2-abs-hi-pc.exp

In gdb.dwarf2/dw2-abs-hi-pc.exp we do:
...
set sources [lmap i $sources { expr { "$srcdir/$subdir/$i" } }]
...

The use of expr is not idiomatic.  Fix this by using set instead:
...
set sources [lmap i $sources { set tmp $srcdir/$subdir/$i }]
...

Reported-By: Tom Tromey <tom@tromey.com>
Reviewed-By: Andreas Schwab <schwab@suse.de>
---
 gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp b/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
index 2ea6a5cea00..5b5d678ec7a 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-abs-hi-pc.exp
@@ -24,7 +24,7 @@ set sources \
 	 ${testfile}.c \
 	 ${testfile}-hello.c \
 	 ${testfile}-world.c]
-set sources [lmap i $sources { expr { "$srcdir/$subdir/$i" } }]
+set sources [lmap i $sources { set tmp $srcdir/$subdir/$i }]
 
 lassign [function_range hello $sources] \
     hello_start hello_len

base-commit: b545d4239bedf9001926efd55da2aa2bd2bbb94a
-- 
2.35.3

Re: [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Tom Tromey]

>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:

Tom> Then with subst we have the same:
Tom> ...
Tom> set res [lmap v $l { subst {$v/c} }]
Tom> ...
Tom> unless we forget the quoting:

This is true for everything in Tcl though.
The quoting matters a lot.

Tom> Hmm, in that case I think subst is the worse choice.  With expr,
Tom> things either parse or not, and if it parses you get the right result.

expr has corner cases where weird things will happen as well.
It's really just intended for use with the expression sub-language.

Tom

Re: [pushed 1/4] [gdb/testsuite] Don't use string cat in gdb.dwarf2/dw2-abs-hi-pc.exp

[Tom de Vries]

On 4/27/23 15:39, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> Tom> Then with subst we have the same:
> Tom> ...
> Tom> set res [lmap v $l { subst {$v/c} }]
> Tom> ...
> Tom> unless we forget the quoting:
> 
> This is true for everything in Tcl though.
> The quoting matters a lot.
> 

True.

> Tom> Hmm, in that case I think subst is the worse choice.  With expr,
> Tom> things either parse or not, and if it parses you get the right result.
> 
> expr has corner cases where weird things will happen as well.
> It's really just intended for use with the expression sub-language.

Ack.

I've just pushed a patch that uses set instead of expr, so this is no 
longer an issue.

Thanks for reporting this.

- Tom