[PATCH 1/4] [gdb/testsuite] Fix duplicates in gdb.fortran/array-{indices,repeat}.exp

[PATCH 1/4] [gdb/testsuite] Fix duplicates in gdb.fortran/array-{indices,repeat}.exp

[Tom de Vries]

When running test-case gdb.fortran/array-indices.exp on a system without
fortran compiler, I run into a duplicate:
...
Running /home/vries/gdb/src/gdb/testsuite/gdb.fortran/array-indices.exp ...
gdb compile failed, default_target_compile: Can't find gfortran.
UNTESTED: gdb.fortran/array-indices.exp: array-indices.exp
gdb compile failed, default_target_compile: Can't find gfortran.
UNTESTED: gdb.fortran/array-indices.exp: array-indices.exp
DUPLICATE: gdb.fortran/array-indices.exp: array-indices.exp
...

Fix this by adding a with_test_prefix at the toplevel.

Likewise in gdb.fortran/array-repeat.exp.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.fortran/array-indices.exp | 37 ++++++++++++---------
 gdb/testsuite/gdb.fortran/array-repeat.exp  | 31 ++++++++++-------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/gdb/testsuite/gdb.fortran/array-indices.exp b/gdb/testsuite/gdb.fortran/array-indices.exp
index 5cfc10cb600..0fb0080639f 100644
--- a/gdb/testsuite/gdb.fortran/array-indices.exp
+++ b/gdb/testsuite/gdb.fortran/array-indices.exp
@@ -62,13 +62,13 @@ set r3p9  [string_to_regexp $a3p9]
 set rep5  "<repeats 5 times>"
 set rep6  "<repeats 6 times>"
 
-proc array_repeat { variant } {
+proc array_repeat_1 { variant } {
     global testfile srcfile
-    upvar n0 n0 n1 n1 n2 n2 n5 n5
-    upvar r1p r1p r1p9 r1p9 r2po r2po r2p9o r2p9o r2p r2p r2p9 r2p9
-    upvar r3po r3po r3p9o r3p9o r3p r3p r3p9 r3p9
-    upvar a2po a2po a2p9o a2p9o a3po a3po a3p9o a3p9o
-    upvar rep5 rep5 rep6 rep6
+    global n0 n0 n1 n1 n2 n2 n5 n5
+    global r1p r1p r1p9 r1p9 r2po r2po r2p9o r2p9o r2p r2p r2p9 r2p9
+    global r3po r3po r3p9o r3p9o r3p r3p r3p9 r3p9
+    global a2po a2po a2p9o a2p9o a3po a3po a3p9o a3p9o
+    global rep5 rep5 rep6 rep6
 
     standard_testfile "${variant}.f90"
 
@@ -77,19 +77,18 @@ proc array_repeat { variant } {
 	return -1
     }
 
-    with_test_prefix "${variant}" {
-	gdb_test_no_output "set print array-indexes on"
-    }
+    gdb_test_no_output "set print array-indexes on"
 
     if {![fortran_runto_main]} {
 	perror "Could not run to main."
 	return
     }
 
-    gdb_breakpoint [gdb_get_line_number "Break here"]
-    gdb_continue_to_breakpoint "${variant}"
+    set line_marker "Break here"
+    gdb_breakpoint [gdb_get_line_number $line_marker]
+    gdb_continue_to_breakpoint $line_marker
 
-    with_test_prefix "${variant}: repeats=unlimited, elements=unlimited" {
+    with_test_prefix "repeats=unlimited, elements=unlimited" {
 	# Check the arrays print as expected.
 	gdb_test_no_output "set print repeats unlimited"
 	gdb_test_no_output "set print elements unlimited"
@@ -102,7 +101,7 @@ proc array_repeat { variant } {
 	gdb_test "print array_3d9" "${r3p9}"
     }
 
-    with_test_prefix "${variant}: repeats=4, elements=unlimited" {
+    with_test_prefix "repeats=4, elements=unlimited" {
 	# Now set the repeat limit.
 	gdb_test_no_output "set print repeats 4"
 	gdb_test_no_output "set print elements unlimited"
@@ -126,7 +125,7 @@ proc array_repeat { variant } {
 				$n5 = ($n0 = ($n0 = 9, ${rep6}) ${rep6}))"]
     }
 
-    with_test_prefix "${variant}: repeats=unlimited, elements=12" {
+    with_test_prefix "repeats=unlimited, elements=12" {
 	# Now set the element limit.
 	gdb_test_no_output "set print repeats unlimited"
 	gdb_test_no_output "set print elements 12"
@@ -147,7 +146,7 @@ proc array_repeat { variant } {
 				...)"]
     }
 
-    with_test_prefix "${variant}: repeats=4, elements=12" {
+    with_test_prefix "repeats=4, elements=12" {
 	# Now set both limits.
 	gdb_test_no_output "set print repeats 4"
 	gdb_test_no_output "set print elements 12"
@@ -173,7 +172,7 @@ proc array_repeat { variant } {
 				       ...) ...)"]
     }
 
-    with_test_prefix "${variant}: repeats=4, elements=30" {
+    with_test_prefix "repeats=4, elements=30" {
 	# Now set both limits.
 	gdb_test_no_output "set print repeats 4"
 	gdb_test_no_output "set print elements 30"
@@ -196,5 +195,11 @@ proc array_repeat { variant } {
     }
 }
 
+proc array_repeat { variant } {
+    with_test_prefix $variant {
+	array_repeat_1 $variant
+    }
+}
+
 array_repeat "array-repeat"
 array_repeat "array-slices-repeat"
diff --git a/gdb/testsuite/gdb.fortran/array-repeat.exp b/gdb/testsuite/gdb.fortran/array-repeat.exp
index 34ea8fc19f5..1a7c013cc16 100644
--- a/gdb/testsuite/gdb.fortran/array-repeat.exp
+++ b/gdb/testsuite/gdb.fortran/array-repeat.exp
@@ -50,12 +50,12 @@ set r3p9  [string_to_regexp $a3p9]
 set rep5  "<repeats 5 times>"
 set rep6  "<repeats 6 times>"
 
-proc array_repeat { variant } {
+proc array_repeat_1 { variant } {
     global testfile srcfile binfile
-    upvar r1p r1p r1p9 r1p9 r2po r2po r2p9o r2p9o r2p r2p r2p9 r2p9
-    upvar r3po r3po r3p9o r3p9o r3p r3p r3p9 r3p9
-    upvar a2po a2po a2p9o a2p9o a3po a3po a3p9o a3p9o
-    upvar rep5 rep5 rep6 rep6
+    global r1p r1p r1p9 r1p9 r2po r2po r2p9o r2p9o r2p r2p r2p9 r2p9
+    global r3po r3po r3p9o r3p9o r3p r3p r3p9 r3p9
+    global a2po a2po a2p9o a2p9o a3po a3po a3p9o a3p9o
+    global rep5 rep5 rep6 rep6
 
     standard_testfile "${variant}.f90"
 
@@ -69,10 +69,11 @@ proc array_repeat { variant } {
 	return
     }
 
-    gdb_breakpoint [gdb_get_line_number "Break here"]
-    gdb_continue_to_breakpoint "${variant}"
+    set line_marker "Break here"
+    gdb_breakpoint [gdb_get_line_number $line_marker]
+    gdb_continue_to_breakpoint $line_marker
 
-    with_test_prefix "${variant}: repeats=unlimited, elements=unlimited" {
+    with_test_prefix "repeats=unlimited, elements=unlimited" {
 	# Check the arrays print as expected.
 	gdb_test_no_output "set print repeats unlimited"
 	gdb_test_no_output "set print elements unlimited"
@@ -85,7 +86,7 @@ proc array_repeat { variant } {
 	gdb_test "print array_3d9" "${r3p9}"
     }
 
-    with_test_prefix "${variant}: repeats=4, elements=unlimited" {
+    with_test_prefix "repeats=4, elements=unlimited" {
 	# Now set the repeat limit.
 	gdb_test_no_output "set print repeats 4"
 	gdb_test_no_output "set print elements unlimited"
@@ -105,7 +106,7 @@ proc array_repeat { variant } {
 				((9, ${rep6}) ${rep6}))"]
     }
 
-    with_test_prefix "${variant}: repeats=unlimited, elements=12" {
+    with_test_prefix "repeats=unlimited, elements=12" {
 	# Now set the element limit.
 	gdb_test_no_output "set print repeats unlimited"
 	gdb_test_no_output "set print elements 12"
@@ -122,7 +123,7 @@ proc array_repeat { variant } {
 	    [string_to_regexp "((${a3p9o} ${a3p9o} ...) ...)"]
     }
 
-    with_test_prefix "${variant}: repeats=4, elements=12" {
+    with_test_prefix "repeats=4, elements=12" {
 	# Now set both limits.
 	gdb_test_no_output "set print repeats 4"
 	gdb_test_no_output "set print elements 12"
@@ -142,7 +143,7 @@ proc array_repeat { variant } {
 	    [string_to_regexp "(((3, ${rep5}, 9) (3, ${rep5}, 9) ...) ...)"]
     }
 
-    with_test_prefix "${variant}: repeats=4, elements=30" {
+    with_test_prefix "repeats=4, elements=30" {
 	# Now set both limits.
 	gdb_test_no_output "set print repeats 4"
 	gdb_test_no_output "set print elements 30"
@@ -163,5 +164,11 @@ proc array_repeat { variant } {
     }
 }
 
+proc array_repeat { variant } {
+    with_test_prefix $variant {
+	array_repeat_1 $variant
+    }
+}
+
 array_repeat "array-repeat"
 array_repeat "array-slices-repeat"

base-commit: 9dc9a56ebc902df4b34cda404da3f3062e9af616
-- 
2.35.3

[PATCH 2/4] [gdb/testsuite] Fix duplicates in gdb.fortran/huge.exp

[Tom de Vries]

With test-case gdb.fortran/huge.exp, on a system without fortran compiler, I
ran into a number of duplicates:
...
Running /home/vries/gdb/src/gdb/testsuite/gdb.fortran/huge.exp ...
gdb compile failed, default_target_compile: Can't find gfortran.
UNTESTED: gdb.fortran/huge.exp: huge.exp
  ...
gdb compile failed, default_target_compile: Can't find gfortran.
UNTESTED: gdb.fortran/huge.exp: huge.exp
DUPLICATE: gdb.fortran/huge.exp: huge.exp
UNSUPPORTED: gdb.fortran/huge.exp: require failed: expr $compilation_succeeded
...

Fix this by wrapping the compile in a with_test_prefix, getting us instead:
...
gdb compile failed, default_target_compile: Can't find gfortran.
UNTESTED: gdb.fortran/huge.exp: CRASH_GDB=2097152: huge.exp
  ...
gdb compile failed, default_target_compile: Can't find gfortran.
UNTESTED: gdb.fortran/huge.exp: CRASH_GDB=16: huge.exp
UNSUPPORTED: gdb.fortran/huge.exp: require failed: expr $compilation_succeeded
...

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.fortran/huge.exp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.fortran/huge.exp b/gdb/testsuite/gdb.fortran/huge.exp
index 8d2158f172b..78c1d521e2a 100644
--- a/gdb/testsuite/gdb.fortran/huge.exp
+++ b/gdb/testsuite/gdb.fortran/huge.exp
@@ -37,8 +37,10 @@ lappend opts f90
 set compilation_succeeded 0
 for { set size [expr $max] } { $size >= $min } { set size [expr $size / 2] } {
     set try_opts [concat $opts [list additional_flags=-DCRASH_GDB=$size]]
-    if { [build_executable $testfile.exp $testfile $srcfile $try_opts] == -1 } {
-	continue
+    with_test_prefix CRASH_GDB=$size {
+	if { [build_executable $testfile.exp $testfile $srcfile $try_opts] == -1 } {
+	    continue
+	}
     }
 
     set compilation_succeeded 1
-- 
2.35.3

[PATCH 3/4] [gdb/testsuite] Fix duplicates in gdb.opt/inline-cmds.exp

[Tom de Vries]

With test-case gdb.opt/inline-cmds.exp on ppc64le-linux, I ran into:
...
PASS: gdb.opt/inline-cmds.exp: finish from marker
 ...
PASS: gdb.opt/inline-cmds.exp: finish from marker
DUPLICATE: gdb.opt/inline-cmds.exp: finish from marker
...

Fix this by issuing less passes.

Tested on ppc64le-linux.
---
 gdb/testsuite/gdb.opt/inline-cmds.exp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
index e33c6e1f5d2..bd645e54902 100644
--- a/gdb/testsuite/gdb.opt/inline-cmds.exp
+++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
@@ -243,13 +243,13 @@ gdb_test "step" ".*set breakpoint 2 here.*" "step into finish marker"
 # the call instruction which still are part of the call sequence,
 # so it should be expected to return to the caller line after issue 
 # a 'finish' command.
-gdb_test_multiple "finish" "finish from marker" {
-    -re "func1 \\\(\\\);.*\r\n$gdb_prompt $" {
-	pass "finish from marker to func1"
+gdb_test_multiple "finish" "finish from marker to func1" {
+    -re -wrap "func1 \\(\\);" {
+	pass $gdb_test_name
     }
-    -re "marker \\\(\\\);.*\r\n$gdb_prompt $" {
-	pass "finish from marker"
-	gdb_test "step" "func1 \\\(\\\);.*" "step after marker to reach func1"
+    -re -wrap "marker \\(\\);" {
+	send_gdb "step\n"
+	exp_continue
     }
 }
 
@@ -261,13 +261,13 @@ set line6 [gdb_get_line_number "set breakpoint 6 here"]
 gdb_breakpoint $line6
 gdb_continue_to_breakpoint "before the outer_inline call"
 gdb_test "step" "marker \\\(\\\) at .*" "reach 1 the outer_inline call"
-gdb_test_multiple "finish" "finish from marker" {
-    -re "main \\\(\\\) at .*outer_inline2 \\\(\\\);.*\r\n$gdb_prompt $" {
-	pass "reach outer_inline2"
+gdb_test_multiple "finish" "reach outer_inline2" {
+    -re -wrap "outer_inline2 \\(\\);" {
+	pass $gdb_test_name
     }
-    -re "main \\\(\\\) at .*marker \\\(\\\);.*\r\n$gdb_prompt $" {
-	pass "finish from marker"
-	gdb_test "step" "outer_inline2 \\\(\\\);.*" "step after marker to reach outer_inline2"
+    -re -wrap "marker \\(\\); .*" {
+	send_gdb "step\n"
+	exp_continue
     }
 }
 gdb_test "bt" "#0  main.*" "backtrace at main of outer_inline"
-- 
2.35.3

[PATCH 4/4] [gdb/testsuite] Fix duplicates in gdb.base/watchpoint-unaligned.exp

[Tom de Vries]

When running test-case gdb.base/watchpoint-unaligned.exp on ppc64le-linux, we
get:
...
XFAIL: $exp: rwatch data.u.size1[3] (PRMS breakpoints/23131)
XFAIL: $exp: rwatch data.u.size1[4] (PRMS breakpoints/23131)
  ...
UNTESTED: $exp: wpcount(4)
XFAIL: $exp: rwatch data.u.size1[3] (PRMS breakpoints/23131)
DUPLICATE: $exp: rwatch data.u.size1[3] (PRMS breakpoints/23131)
XFAIL: $exp: rwatch data.u.size1[4] (PRMS breakpoints/23131)
DUPLICATE: $exp: rwatch data.u.size1[4] (PRMS breakpoints/23131)
  ...
UNTESTED: $exp: wpcount(7)
...

Fix this by using foreach_with_prefix.

Tested on ppc64le-linux.
---
 gdb/testsuite/gdb.base/watchpoint-unaligned.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
index 35e8868d39d..999dd3a85ed 100644
--- a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp
@@ -98,7 +98,7 @@ foreach wpsize $sizes {
     }
 }
 
-foreach wpcount {4 7} {
+foreach_with_prefix wpcount {4 7} {
     array set wpoffset_to_wpnum {}
     for {set wpoffset 1} {$wpoffset <= $wpcount} {incr wpoffset} {
 	set test "$rwatch data.u.size1\[$wpoffset\]"
-- 
2.35.3

Re: [PATCH 1/4] [gdb/testsuite] Fix duplicates in gdb.fortran/array-{indices, repeat}.exp

[Alexandra Petlanova Hajkova]

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

On Tue, Jun 11, 2024 at 3:10 PM Tom de Vries <tdevries@suse.de> wrote:

> When running test-case gdb.fortran/array-indices.exp on a system without
> fortran compiler, I run into a duplicate:
> ...
> Running /home/vries/gdb/src/gdb/testsuite/gdb.fortran/array-indices.exp ...
> gdb compile failed, default_target_compile: Can't find gfortran.
> UNTESTED: gdb.fortran/array-indices.exp: array-indices.exp
> gdb compile failed, default_target_compile: Can't find gfortran.
> UNTESTED: gdb.fortran/array-indices.exp: array-indices.exp
> DUPLICATE: gdb.fortran/array-indices.exp: array-indices.exp
> ...
>
> Fix this by adding a with_test_prefix at the toplevel.
>
> Likewise in gdb.fortran/array-repeat.exp.
>
>
> Hi,

I can confirm I can reproduce this issue on aarch64 and that your patch is
fixing it
 Reviewed-By: Alexandra Petlanova Hajkova <ahajkova@redhat.com>


make check TESTS=gdb.fortran/array-indices.exp
BEFORE the fix:
gdb compile failed, default_target_compile: Can't find gfortran.
gdb compile failed, default_target_compile: Can't find gfortran.
DUPLICATE: gdb.fortran/array-indices.exp: array-indices.exp

=== gdb Summary ===

# of untested testcases 2
# of duplicate test names 1
/root/build/gdb/gdb version  16.0.50.20240612-git -nw -nx -q -iex "set
height 0" -iex "set width 0" -data-directory /root/build/gdb/data-directory

AFTER;
Running
/root/build/gdb/testsuite/../../../binutils-gdb/gdb/testsuite/gdb.fortran/array-indices.exp
...
gdb compile failed, default_target_compile: Can't find gfortran.
gdb compile failed, default_target_compile: Can't find gfortran.

=== gdb Summary ===

# of untested testcases 2
/root/build/gdb/gdb version  16.0.50.20240612-git -nw -nx -q -iex "set
height 0" -iex "set width 0" -data-directory /root/build/gdb/data-directory

Re: [PATCH 1/4] [gdb/testsuite] Fix duplicates in gdb.fortran/array-{indices, repeat}.exp

[Tom de Vries]

On 6/17/24 11:00, Alexandra Petlanova Hajkova wrote:
> 
> 
> On Tue, Jun 11, 2024 at 3:10 PM Tom de Vries <tdevries@suse.de 
> <mailto:tdevries@suse.de>> wrote:
> 
>     When running test-case gdb.fortran/array-indices.exp on a system without
>     fortran compiler, I run into a duplicate:
>     ...
>     Running
>     /home/vries/gdb/src/gdb/testsuite/gdb.fortran/array-indices.exp ...
>     gdb compile failed, default_target_compile: Can't find gfortran.
>     UNTESTED: gdb.fortran/array-indices.exp: array-indices.exp
>     gdb compile failed, default_target_compile: Can't find gfortran.
>     UNTESTED: gdb.fortran/array-indices.exp: array-indices.exp
>     DUPLICATE: gdb.fortran/array-indices.exp: array-indices.exp
>     ...
> 
>     Fix this by adding a with_test_prefix at the toplevel.
> 
>     Likewise in gdb.fortran/array-repeat.exp.
> 
> 
> Hi,
> 
> I can confirm I can reproduce this issue on aarch64 and that your patch 
> is fixing it
>   Reviewed-By: Alexandra Petlanova Hajkova <ahajkova@redhat.com 

Hi Alexandra,

thanks for the review, pushed.

Thanks,
- Tom

> <mailto:ahajkova@redhat.com>>
> 
> 
> make check TESTS=gdb.fortran/array-indices.exp
> BEFORE the fix:
> gdb compile failed, default_target_compile: Can't find gfortran.
> gdb compile failed, default_target_compile: Can't find gfortran.
> DUPLICATE: gdb.fortran/array-indices.exp: array-indices.exp
> 
> === gdb Summary ===
> 
> # of untested testcases 2
> # of duplicate test names 1
> /root/build/gdb/gdb version  16.0.50.20240612-git -nw -nx -q -iex "set 
> height 0" -iex "set width 0" -data-directory /root/build/gdb/data-directory
> 
> AFTER;
> Running 
> /root/build/gdb/testsuite/../../../binutils-gdb/gdb/testsuite/gdb.fortran/array-indices.exp ...
> gdb compile failed, default_target_compile: Can't find gfortran.
> gdb compile failed, default_target_compile: Can't find gfortran.
> 
> === gdb Summary ===
> 
> # of untested testcases 2
> /root/build/gdb/gdb version  16.0.50.20240612-git -nw -nx -q -iex "set 
> height 0" -iex "set width 0" -data-directory /root/build/gdb/data-directory
> 

Re: [PATCH 2/4] [gdb/testsuite] Fix duplicates in gdb.fortran/huge.exp

[Tom de Vries]

On 6/11/24 15:11, Tom de Vries wrote:
> With test-case gdb.fortran/huge.exp, on a system without fortran compiler, I
> ran into a number of duplicates:
> ...
> Running /home/vries/gdb/src/gdb/testsuite/gdb.fortran/huge.exp ...
> gdb compile failed, default_target_compile: Can't find gfortran.
> UNTESTED: gdb.fortran/huge.exp: huge.exp
>    ...
> gdb compile failed, default_target_compile: Can't find gfortran.
> UNTESTED: gdb.fortran/huge.exp: huge.exp
> DUPLICATE: gdb.fortran/huge.exp: huge.exp
> UNSUPPORTED: gdb.fortran/huge.exp: require failed: expr $compilation_succeeded
> ...
> 
> Fix this by wrapping the compile in a with_test_prefix, getting us instead:
> ...
> gdb compile failed, default_target_compile: Can't find gfortran.
> UNTESTED: gdb.fortran/huge.exp: CRASH_GDB=2097152: huge.exp
>    ...
> gdb compile failed, default_target_compile: Can't find gfortran.
> UNTESTED: gdb.fortran/huge.exp: CRASH_GDB=16: huge.exp
> UNSUPPORTED: gdb.fortran/huge.exp: require failed: expr $compilation_succeeded
> ...
> 

I've pushed the rest of the series (the 1st patch was already committed).

Thanks,
- Tom


> Tested on x86_64-linux.
> ---
>   gdb/testsuite/gdb.fortran/huge.exp | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.fortran/huge.exp b/gdb/testsuite/gdb.fortran/huge.exp
> index 8d2158f172b..78c1d521e2a 100644
> --- a/gdb/testsuite/gdb.fortran/huge.exp
> +++ b/gdb/testsuite/gdb.fortran/huge.exp
> @@ -37,8 +37,10 @@ lappend opts f90
>   set compilation_succeeded 0
>   for { set size [expr $max] } { $size >= $min } { set size [expr $size / 2] } {
>       set try_opts [concat $opts [list additional_flags=-DCRASH_GDB=$size]]
> -    if { [build_executable $testfile.exp $testfile $srcfile $try_opts] == -1 } {
> -	continue
> +    with_test_prefix CRASH_GDB=$size {
> +	if { [build_executable $testfile.exp $testfile $srcfile $try_opts] == -1 } {
> +	    continue
> +	}
>       }
>   
>       set compilation_succeeded 1