From: Tom de Vries <tdevries@suse.de>
Date: Thu, 1 Aug 2019 08:48:11 +0000 (+0200)
Subject: [gdb/testsuite] Fix gdb.base/break-interp.exp timeout with check-read1
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=117eb594228cf5447e49475e4fb33480c1f717a7;p=deliverable%2Fbinutils-gdb.git

[gdb/testsuite] Fix gdb.base/break-interp.exp timeout with check-read1

With gdb.base/break-interp.exp and check-read1, we run get:
...
FAIL: gdb.base/break-interp.exp: LDprelinkNOdebugNO: \
  BINprelinkNOdebugNOpieNO: symbol-less: info files (timeout)
FAIL: gdb.base/break-interp.exp: LDprelinkNOdebugNO: \
  BINprelinkNOdebugNOpieYES: symbol-less: info files (timeout)
FAIL: gdb.base/break-interp.exp: LDprelinkNOdebugIN: \
  BINprelinkNOdebugNOpieNO: symbol-less: info files (timeout)
FAIL: gdb.base/break-interp.exp: LDprelinkNOdebugIN: \
  BINprelinkNOdebugNOpieYES: symbol-less: info files (timeout)
...

Fix this by calling exp_continue after each "info files" line.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2019-08-01  Tom de Vries  <tdevries@suse.de>

	PR testsuite/24863
	* gdb.base/break-interp.exp: Use exp_continue after each "info files"
	line.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6844c45e55..d8b4c766bb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-08-01  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/24863
+	* gdb.base/break-interp.exp: Use exp_continue after each "info files"
+	line.
+
 2019-08-01  Tom de Vries  <tdevries@suse.de>
 
 	PR testsuite/24863
diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 51e31f6503..d6da653529 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -451,6 +451,10 @@ proc test_ld {file ifmain trynosym displacement} {
 	    # to slow processing of wildcard capturing long output
 	    set test "info files"
 	    set entrynohex ""
+	    set info_line [join [list \
+				     "\r\n" "\[\t\]" "0x\[0-9af\]+" " - " \
+				     "0x\[0-9af\]+" " @ " "0x\[0-9af\]+"  \
+				     " is " "\[^\r\n\]+"] ""]
 	    gdb_test_multiple $test $test {
 		-re "\r\n\[\t \]*Entry point:\[\t \]*0x(\[0-9a-f\]+)\r\n" {
 		    set entrynohex $expect_out(1,string)
@@ -458,6 +462,10 @@ proc test_ld {file ifmain trynosym displacement} {
 			-re "\r\n$gdb_prompt $" {
 			    pass $test
 			}
+			-re $info_line {
+			    # Avoid timeout with check-read1
+			    exp_continue
+			}
 		    }
 		}
 	    }