From: Tom de Vries <tdevries@suse.de>
Date: Mon, 11 Nov 2024 14:57:38 +0000 (+0100)
Subject: [gdb/testsuite] Avoid intermittent failures on another debuginfod test
X-Git-Tag: gdb-16-branchpoint~469
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89e99b67475dce388846e12819a3bb70ba6ab06f;p=thirdparty%2Fbinutils-gdb.git

[gdb/testsuite] Avoid intermittent failures on another debuginfod test

With test-case gdb.debuginfod/solib-with-soname.exp on aarch64-linux, I ran
into:
...
(gdb) core-file solib-with-soname.core^M
Downloading 197.86 K file libfoo_1.so...^M
[New LWP 997314]^M
[Thread debugging using libthread_db enabled]^M
Using host libthread_db library "/lib64/libthread_db.so.1".^M
Core was generated by `solib-with-soname'.^M
Program terminated with signal SIGABRT, Aborted.^M
(gdb) FAIL: $exp: load core file, use debuginfod: load core file
...

The test-case doesn't expect the "197.86 K" part.

The same problem was fixed for another test-case in commit a723c56efb0
("gdb/testsuite: avoid intermittent failures on a debuginfod test").

Fix this in the same way: by updating the regexp.

Tested on aarch64-linux.

PR testsuite/32354
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32354
---

diff --git a/gdb/testsuite/gdb.debuginfod/solib-with-soname.exp b/gdb/testsuite/gdb.debuginfod/solib-with-soname.exp
index 31ca7181af6..98c4535fca7 100644
--- a/gdb/testsuite/gdb.debuginfod/solib-with-soname.exp
+++ b/gdb/testsuite/gdb.debuginfod/solib-with-soname.exp
@@ -161,7 +161,7 @@ proc load_exec_and_core_file { expect_warning expect_download testname \
 		set saw_warning true
 		exp_continue
 	    }
-	    -re "^Downloading file \[^\r\n\]+/libfoo_1\\.so\\.\\.\\.\r\n" {
+	    -re "^Downloading\[^\r\n\]*file \[^\r\n\]+/libfoo_1\\.so\\.\\.\\.\r\n" {
 		set saw_download true
 		exp_continue
 	    }