[PATCH, TEST REQUEST][gdb/testsuite] Fix ERROR in gdb.ctf/funcreturn.exp

[Tom de Vries <tdevries@suse.de>]

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

[ Re: [PATCH 0/2] gdb: Fix DUPLICATE and PATH regressions throughout ]

On 5/19/22 14:34, Pedro Alves wrote:
> Patch #1 adds "gdb_test -nopass" as mentioned here:
> 
>    https://sourceware.org/pipermail/gdb-patches/2022-May/189189.html
> 
> Patch #2 fixes DUPLICATE/PATH regressions throughout.
> 

Related fix in gdb.ctf.

Can somebody with working ctf setup test this for me?

Thanks,
- Tom

[-- Attachment #2: 0001-gdb-testsuite-Fix-ERROR-in-gdb.ctf-funcreturn.exp.patch --]
[-- Type: text/x-patch, Size: 2320 bytes --]

[gdb/testsuite] Fix ERROR in gdb.ctf/funcreturn.exp

On openSUSE Tumbleweed (with gcc-12, enabling ctf tests) I run into:
...
ERROR: tcl error sourcing src/gdb/testsuite/gdb.ctf/funcreturn.exp.
ERROR: tcl error code NONE
ERROR: Unexpected arguments: \
  {print v_double_func} \
  {[0-9]+ = {double \(\)} 0x[0-9a-z]+.*} \
  {print double function} \
  }
...

The problem is a curly brace as fourth argument to gdb_test, which errors out
due to recently introduced more strict argument checking in gdb_test.

Fix the error by removing the brace.

Though this fixes the error for me, due to PR29160 I get only FAILs, so I can't
claim proper testing on x86_64-linux.

---
 gdb/testsuite/gdb.ctf/funcreturn.exp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/gdb/testsuite/gdb.ctf/funcreturn.exp b/gdb/testsuite/gdb.ctf/funcreturn.exp
index 8f2723bdb89..fe4e045d0ce 100644
--- a/gdb/testsuite/gdb.ctf/funcreturn.exp
+++ b/gdb/testsuite/gdb.ctf/funcreturn.exp
@@ -106,14 +106,13 @@ if ![target_info exists no_long_long] {
 
 # Sun /bin/cc calls this a function returning double.
 if {!$gcc_compiled} then {setup_xfail "*-sun-sunos4*"}
-	gdb_test "print v_float_func" \
-	    "$decimal = \{float \\(\\)\} 0x\[0-9a-z\]+.*" \
-	    "print float function"
+gdb_test "print v_float_func" \
+    "$decimal = \{float \\(\\)\} 0x\[0-9a-z\]+.*" \
+    "print float function"
 
-	gdb_test "print v_double_func" \
-	    "$decimal = \{double \\(\\)\} 0x\[0-9a-z\]+.*" \
-	    "print double function" \
-}
+gdb_test "print v_double_func" \
+    "$decimal = \{double \\(\\)\} 0x\[0-9a-z\]+.*" \
+    "print double function"
 
 # test whatis command with functions return type
 gdb_test "whatis v_char_func" \
@@ -180,11 +179,10 @@ if ![target_info exists no_long_long] {
 
 # Sun /bin/cc calls this a function returning double.
 if {!$gcc_compiled} then {setup_xfail "*-sun-sunos4*"}
-	gdb_test "whatis v_float_func" \
-	    "type = float \\($void\\)" \
-	    "whatis float function"
+gdb_test "whatis v_float_func" \
+    "type = float \\($void\\)" \
+    "whatis float function"
 
-	gdb_test "whatis v_double_func" \
-	    "type = double \\($void\\)" \
-	    "whatis double function" \
-}
+gdb_test "whatis v_double_func" \
+    "type = double \\($void\\)" \
+    "whatis double function"