This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=117eb594228cf5447e49475e4fb33480c1f717a7

commit 117eb594228cf5447e49475e4fb33480c1f717a7
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Aug 1 10:48:11 2019 +0200

    [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:
---
 gdb/testsuite/ChangeLog                 | 6 ++++++
 gdb/testsuite/gdb.base/break-interp.exp | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6844c45..d8b4c76 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,6 +1,12 @@
 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
 	* gdb.base/signals.exp: Fix check-read1 timeout using gdb_test_sequence.
 
 2019-07-30  Tom Tromey  <tromey@adacore.com>
diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 51e31f6..d6da653 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
+			}
 		    }
 		}
 	    }


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]