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 --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 02a9a07b1a2f3ca0c79e7f9ada8a1dd345cf8e69..08b5b6fbc75528c4cd41db650707c59f9b0403c8 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gdb/testsuite/lib/range-stepping-support.exp b/gdb/testsuite/lib/range-stepping-support.exp
index 1b273093af3bc3742ba483bd94ebdfc6235d5d8b..8cfc08b04a83c6db08a499f65eaf2131f2b3b467 100644 (file)
--- 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
        }