From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vries@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2205)
 id F10903858C74; Sat,  4 Jun 2022 09:19:05 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F10903858C74
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Tom de Vries <vries@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] [gdb/testsuite] Fix ERROR in gdb.ctf/funcreturn.exp
X-Act-Checkin: binutils-gdb
X-Git-Author: Tom de Vries <tdevries@suse.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: de15377594391aa201fba1ce7d8924274e10abbf
X-Git-Newrev: 0c05610450e5f19f03245ac646587e35cab53e7b
Message-Id: <20220604091905.F10903858C74@sourceware.org>
Date: Sat,  4 Jun 2022 09:19:05 +0000 (GMT)
X-BeenThere: gdb-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gdb-cvs mailing list <gdb-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/gdb-cvs/>
List-Help: <mailto:gdb-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jun 2022 09:19:06 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D0c05610450e5=
f19f03245ac646587e35cab53e7b

commit 0c05610450e5f19f03245ac646587e35cab53e7b
Author: Tom de Vries <tdevries@suse.de>
Date:   Sat Jun 4 11:19:01 2022 +0200

    [gdb/testsuite] Fix ERROR in gdb.ctf/funcreturn.exp
   =20
    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]+ =3D {double \(\)} 0x[0-9a-z]+.*} \
      {print double function} \
      }
    ...
   =20
    The problem is a curly brace as fourth argument to gdb_test, which erro=
rs out
    due to recently introduced more strict argument checking in gdb_test.
   =20
    Fix the error by removing the brace.
   =20
    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.

Diff:
---
 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/f=
uncreturn.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] {
=20
 # Sun /bin/cc calls this a function returning double.
 if {!$gcc_compiled} then {setup_xfail "*-sun-sunos4*"}
-	gdb_test "print v_float_func" \
-	    "$decimal =3D \{float \\(\\)\} 0x\[0-9a-z\]+.*" \
-	    "print float function"
+gdb_test "print v_float_func" \
+    "$decimal =3D \{float \\(\\)\} 0x\[0-9a-z\]+.*" \
+    "print float function"
=20
-	gdb_test "print v_double_func" \
-	    "$decimal =3D \{double \\(\\)\} 0x\[0-9a-z\]+.*" \
-	    "print double function" \
-}
+gdb_test "print v_double_func" \
+    "$decimal =3D \{double \\(\\)\} 0x\[0-9a-z\]+.*" \
+    "print double function"
=20
 # test whatis command with functions return type
 gdb_test "whatis v_char_func" \
@@ -180,11 +179,10 @@ if ![target_info exists no_long_long] {
=20
 # Sun /bin/cc calls this a function returning double.
 if {!$gcc_compiled} then {setup_xfail "*-sun-sunos4*"}
-	gdb_test "whatis v_float_func" \
-	    "type =3D float \\($void\\)" \
-	    "whatis float function"
+gdb_test "whatis v_float_func" \
+    "type =3D float \\($void\\)" \
+    "whatis float function"
=20
-	gdb_test "whatis v_double_func" \
-	    "type =3D double \\($void\\)" \
-	    "whatis double function" \
-}
+gdb_test "whatis v_double_func" \
+    "type =3D double \\($void\\)" \
+    "whatis double function"