From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 8E9AB3857809; Thu, 25 Jan 2024 15:34:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E9AB3857809 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1706196897; bh=0ztDvu2V+R0vKG8QrfHZWjvVm9IrD/R3/Aw1u5es8GQ=; h=From:To:Subject:Date:From; b=Ysmyiqy4LZMob8dK+1OwZAaScyboudXq2AMNfXg26gL8INrSvj37/rmK6QC04rcR3 oUzwDfxslflws3mK9mKIoLv+RpucP9127HY3yyVGIxdzJBIYVd+fMvZ4DEQ9MAmqOh mE3ohm0daGXNzKNmcw51dC/Y7XDYUBD0lxgk8eXs= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix regexp in vgdb_start X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 4201dd33a2ba74bc1e10cea76074830e1bfa7943 X-Git-Newrev: 033c5df8401bd72ab8d1d123daafab6ff3bd32b9 Message-Id: <20240125153457.8E9AB3857809@sourceware.org> Date: Thu, 25 Jan 2024 15:34:57 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D033c5df8401b= d72ab8d1d123daafab6ff3bd32b9 commit 033c5df8401bd72ab8d1d123daafab6ff3bd32b9 Author: Tom de Vries Date: Thu Jan 25 16:36:09 2024 +0100 [gdb/testsuite] Fix regexp in vgdb_start =20 On Fedora 39 aarch64 I run into: ... (gdb) target remote | vgdb --wait=3D2 --max-invoke-ms=3D2500 --pid=3D21= 14437^M Remote debugging using | vgdb --wait=3D2 --max-invoke-ms=3D2500 --pid= =3D2114437^M relaying data between gdb and process 2114437^M warning: remote target does not support file transfer, \ attempting to access files from local filesystem.^M Reading symbols from /lib/ld-linux-aarch64.so.1...^M _start () at ../sysdeps/aarch64/dl-start.S:22^M warning: 22 ../sysdeps/aarch64/dl-start.S: No such file or director= y^M (gdb) FAIL: gdb.base/valgrind-infcall.exp: target remote for vgdb ... =20 For contrast, on openSUSE Leap 15.4 x86_64 I have: ... (gdb) target remote | vgdb --wait=3D2 --max-invoke-ms=3D2500 --pid=3D18= 797^M Remote debugging using | vgdb --wait=3D2 --max-invoke-ms=3D2500 --pid= =3D18797^M relaying data between gdb and process 18797^M warning: remote target does not support file transfer, \ attempting to access files from local filesystem.^M Reading symbols from /lib64/ld-linux-x86-64.so.2...^M (No debugging symbols found in /lib64/ld-linux-x86-64.so.2)^M 0x0000000004002550 in _start () from /lib64/ld-linux-x86-64.so.2^M (gdb) PASS: gdb.base/valgrind-infcall.exp: target remote for vgdb ... =20 The fail happens in vgdb_start because the regexp only matches the "in _start ()" variant, not the "_start () at": ... gdb_test "$vgdbcmd" " in \\.?_start .*" "target remote for vgdb" ... Which variant you get is determined by presence of debug info. =20 Fix this by also matching the "_start () at" variant. =20 Tested aarch64-linux and x86_64-linux. =20 Approved-By: Tom Tromey Diff: --- gdb/testsuite/lib/valgrind.exp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/valgrind.exp b/gdb/testsuite/lib/valgrind.exp index 11d92fff26a..2f2d58844f4 100644 --- a/gdb/testsuite/lib/valgrind.exp +++ b/gdb/testsuite/lib/valgrind.exp @@ -92,7 +92,10 @@ proc vgdb_start { {active_at_startup 1} } { set vgdbcmd "target remote | vgdb --wait=3D2 --max-invoke-ms=3D2500 --= pid=3D$vgdbpid" =20 if { $active_at_startup } { - gdb_test "$vgdbcmd" " in \\.?_start .*" "target remote for vgdb" + set start_re1 " in \\.?_start " + set start_re2 "\\.?_start \\(\\) at " + gdb_test "$vgdbcmd" "($start_re1|$start_re2).*" \ + "target remote for vgdb" } else { # Let $binfile run a bit before attaching. This is a bit of a hack, # in that it lets test-case valgrind-infcall-2.exp run to the point of