[binutils-gdb] testsuite: Range stepping and non-stop mode

[Pedro Alves <palves at sourceware dot org>]

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

commit 04bf20c5687b102b9a2c2a915d4c400788296a3b
Author: Pedro Alves <palves@redhat.com>
Date:   Mon Nov 30 16:05:23 2015 +0000

    testsuite: Range stepping and non-stop mode
    
    The range-stepping tests fail with "maint set target-non-stop on" mode
    because exec_cmd_expect_vCont_count doesn't know that in non-stop
    mode, vCont's reply is simply "OK".
    
    gdb/testsuite/ChangeLog:
    2015-11-30  Pedro Alves  <palves@redhat.com>
    
    	* lib/range-stepping-support.exp (exec_cmd_expect_vCont_count):
    	Handle non-stop mode vCont replies.

Diff:
---
 gdb/testsuite/ChangeLog                      | 5 +++++
 gdb/testsuite/lib/range-stepping-support.exp | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 02a9a07..08b5b6f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2015-11-30  Pedro Alves  <palves@redhat.com>
 
+	* lib/range-stepping-support.exp (exec_cmd_expect_vCont_count):
+	Handle non-stop mode vCont replies.
+
+2015-11-30  Pedro Alves  <palves@redhat.com>
+
 	* gdb.base/dprintf-non-stop.exp: Use build_executable instead of
 	prepare_for_testing.  Start gdb with "set non-stop on" appended to
 	GDBFLAGS.  Lax expected stop output.
diff --git a/gdb/testsuite/lib/range-stepping-support.exp b/gdb/testsuite/lib/range-stepping-support.exp
index 1b27309..8cfc08b 100644
--- a/gdb/testsuite/lib/range-stepping-support.exp
+++ b/gdb/testsuite/lib/range-stepping-support.exp
@@ -25,12 +25,15 @@ proc exec_cmd_expect_vCont_count { cmd exp_vCont_r } {
     set r_counter 0
     set s_counter 0
     set ret 1
+    # We either get a stop reply in all-stop mode, or an OK in
+    # non-stop mode.
+    set vcont_reply "(T\[\[:xdigit:\]\]\[\[:xdigit:\]\]|OK)"
     gdb_test_multiple $cmd $test {
-	-re "vCont;s\[^\r\n\]*Packet received: T\[\[:xdigit:\]\]\[\[:xdigit:\]\]" {
+	-re "vCont;s\[^\r\n\]*Packet received: $vcont_reply" {
 	    incr s_counter
 	    exp_continue
 	}
-	-re "vCont;r\[^\r\n\]*Packet received: T\[\[:xdigit:\]\]\[\[:xdigit:\]\]" {
+	-re "vCont;r\[^\r\n\]*Packet received: $vcont_reply" {
 	    incr r_counter
 	    exp_continue
 	}