From 58eaf4e9bdf53806778e94efe932e9417a21a306 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 14 Sep 2021 14:52:38 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb_load_no_complaints with gnu-debuglink When running test-case gdb.dwarf2/dw2-ranges-psym-warning.exp with target board gnu-debuglink I run into: ... (gdb) file dw2-ranges-psym-warning^M Reading symbols from dw2-ranges-psym-warning...^M Reading symbols from .debug/dw2-ranges-psym-warning.debug...^M (gdb) FAIL: gdb.dwarf2/dw2-ranges-psym-warning.exp: No complaints ... Fix this by updating the regexp in gdb_load_no_complaints. Tested on x86_64-linux. --- gdb/testsuite/lib/gdb.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 926c33293d2..929e6b1650a 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5406,8 +5406,8 @@ proc gdb_load_no_complaints { arg } { # Verify that there were no complaints. set re \ [multi_line \ - "^Reading symbols from \[^\r\n\]*" \ - "(Expanding full symbols from \[^\r\n\]*" \ + "^(Reading symbols from \[^\r\n\]*" \ + ")+(Expanding full symbols from \[^\r\n\]*" \ ")?$gdb_prompt $"] gdb_assert {[regexp $re $gdb_file_cmd_msg]} "No complaints" } -- 2.30.2