From 04bf20c5687b102b9a2c2a915d4c400788296a3b Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 30 Nov 2015 16:05:23 +0000 Subject: [PATCH] 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 * lib/range-stepping-support.exp (exec_cmd_expect_vCont_count): Handle non-stop mode vCont replies. --- 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 02a9a07b1a2..08b5b6fbc75 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-11-30 Pedro Alves + + * lib/range-stepping-support.exp (exec_cmd_expect_vCont_count): + Handle non-stop mode vCont replies. + 2015-11-30 Pedro Alves * 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 1b273093af3..8cfc08b04a8 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 } -- 2.30.2