From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vries@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2205)
 id 19A01385145C; Mon, 11 Apr 2022 08:28:45 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19A01385145C
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 gdb.base/annota1.exp with pie
X-Act-Checkin: binutils-gdb
X-Git-Author: Tom de Vries <tdevries@suse.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: e7be72923383c39361f14a6a940ad99383e654ad
X-Git-Newrev: 04f4c17c7a14ebb6c2212267b2ebc83f1376fe20
Message-Id: <20220411082845.19A01385145C@sourceware.org>
Date: Mon, 11 Apr 2022 08:28:45 +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: Mon, 11 Apr 2022 08:28:45 -0000

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

commit 04f4c17c7a14ebb6c2212267b2ebc83f1376fe20
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Apr 11 10:28:41 2022 +0200

    [gdb/testsuite] Fix gdb.base/annota1.exp with pie
   =20
    Since commit 359efc2d894 ("[gdb/testsuite] Make gdb.base/annota1.exp mo=
re
    robust") we see this fail with target board unix/-fPIE/-pie:
    ...
    FAIL: gdb.base/annota1.exp: run until main breakpoint (timeout)
    ...
   =20
    The problem is that the commit makes the number and order of matched
    annotations fixed, while between target boards unix and unix/-fPIE/-pie=
 there
    is a difference:
    ...
     \032\032post-prompt
     Starting program: outputs/gdb.base/annota1/annota1
   =20
    +\032\032breakpoints-invalid
    +
     \032\032starting
   =20
     \032\032frames-invalid
    ...
   =20
    Fix this by optionally matching the additional annotation.
   =20
    Tested on x86_64-linux.

Diff:
---
 gdb/testsuite/gdb.base/annota1.exp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/an=
nota1.exp
index 40a13e7cf19..ac6ad6478f4 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -159,6 +159,8 @@ set run_re \
 	 "\r\n\032\032post-prompt\r\n" \
 	 "Starting program: $binexp \r\n" \
 	 $optional_re \
+	 "\(\r\n\032\032breakpoints-invalid\r\n\)?" \
+	 $optional_re \
 	 "\r\n\032\032starting\r\n" \
 	 $optional_re \
 	 "\r\n\032\032frames-invalid\r\n" \