From 04f4c17c7a14ebb6c2212267b2ebc83f1376fe20 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 11 Apr 2022 10:28:41 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.base/annota1.exp with pie Since commit 359efc2d894 ("[gdb/testsuite] Make gdb.base/annota1.exp more robust") we see this fail with target board unix/-fPIE/-pie: ... FAIL: gdb.base/annota1.exp: run until main breakpoint (timeout) ... 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 +\032\032breakpoints-invalid + \032\032starting \032\032frames-invalid ... Fix this by optionally matching the additional annotation. Tested on x86_64-linux. --- 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/annota1.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" \ -- 2.30.2