From: Tom de Vries <tdevries@suse.de>
Date: Tue, 11 Jun 2019 11:54:10 +0000 (+0200)
Subject: [gdb/testsuite] Fix remove-inferiors.exp FAIL with readnow board
X-Git-Tag: binutils-2_33~961
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fea82da0fe15137fda0056c0f0b92b6e70997ea8;p=thirdparty%2Fbinutils-gdb.git

[gdb/testsuite] Fix remove-inferiors.exp FAIL with readnow board

We see this failure with the readnow board:
...
FAIL: gdb.multi/remove-inferiors.exp: load binary
...

When running with board readnow, an extra message "Expanding full symbols" is
emitted after the "Reading symbols" message, and the regexp corresponding to
the FAIL only allows the first message.

Fix this by allowing the extra message in the regexp.

gdb/testsuite/ChangeLog:

2019-06-11  Tom de Vries  <tdevries@suse.de>

	PR testsuite/24521
	* gdb.multi/remove-inferiors.exp: Allow "Expanding full symbols"
	message.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0eaf7bbedea..c42b9635a41 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-11  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/24521
+	* gdb.multi/remove-inferiors.exp: Allow "Expanding full symbols"
+	message.
+
 2019-06-11  Tom de Vries  <tdevries@suse.de>
 
 	PR testsuite/24521
diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index ec13ce52d20..18f6c902258 100644
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -49,8 +49,9 @@ proc test_remove_inferiors { } {
     # Load binfile and start the inferior.
     set binfile_re [string_to_regexp ${binfile}]
     gdb_test "file ${binfile}" \
-	     "Reading symbols from ${binfile_re}..." \
-	     "load binary"
+	[multi_line "Reading symbols from ${binfile_re}\.\.\.(" \
+	     "Expanding full symbols from ${binfile_re}\.\.\.)?" ] \
+	"load binary"
 
     if {![runto_main]} {
 	fail "couldn't run to main."