Re: [PATCH 5/5] range stepping: tests

Yao Qi
2013-05-24T02:27:20Z

On 05/24/2013 02:03 AM, Pedro Alves wrote:

> But I'm not understanding how this is catching the issue. Why
> would "print/x \$pc" fail if the stub degenerates to
> implementing vCont;r as a single instruction step?

I switch to letting proc exec_cmd_expect_vCont_count return 0 or 1 to
indicate the test pass or not, and skip the rest if it returns 1 in
the test. How about this below?

--
Yao (é½å°§)

gdb/testsuite:

2013-05-24 Yao Qi <yao@codesourcery.com>
Pedro Alves <palves@redhat.com>

* gdb.base/range-stepping.exp: Skip the rest of tests if the
test fails.
* lib/range-stepping-support.exp (exec_cmd_expect_vCont_count):
Return 0 if the test passes, otherwise return 1.
---
gdb/testsuite/gdb.base/range-stepping.exp | 10 +++++++++-
gdb/testsuite/lib/range-stepping-support.exp | 6 +++++-
2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.base/range-stepping.exp b/gdb/testsuite/gdb.base/range-stepping.exp
index 48fc15b..d17596c 100644
--- a/gdb/testsuite/gdb.base/range-stepping.exp
+++ b/gdb/testsuite/gdb.base/range-stepping.exp
@@ -76,7 +76,15 @@ with_test_prefix "multi insns" {
# <-- T05
# --> vCont;rSTART,END (range step)
# <-- T05
- exec_cmd_expect_vCont_count "next" 1 1
+ set result [exec_cmd_expect_vCont_count "next" 1 1]
+ if { $result } {
+ # This is the first range-stepping test, and the simplest
+ # one. If it fails, probably the rest of the tests would
+ # fail too, and the huge number of rsp packets in the test
+ # with the time-consuming loop would blow up the gdb.log file.
+ # Skip the rest of the tests.
+ return
+ }

set pc_after_stepping ""
set msg "pc after stepping"
diff --git a/gdb/testsuite/lib/range-stepping-support.exp b/gdb/testsuite/lib/range-stepping-support.exp
index d849665..ab38b11 100644
--- a/gdb/testsuite/lib/range-stepping-support.exp
+++ b/gdb/testsuite/lib/range-stepping-support.exp
@@ -14,7 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

# Execute command CMD and check that GDB sends the expected number of
-# vCont;s and vCont;r packets.
+# vCont;s and vCont;r packets. Returns 0 if the test passes,
+# otherwise returns 1.

proc exec_cmd_expect_vCont_count { cmd exp_vCont_s exp_vCont_r } {
global gdb_prompt
@@ -24,6 +25,7 @@ proc exec_cmd_expect_vCont_count { cmd exp_vCont_s exp_vCont_r } {
set test "${cmd}: vCont;s=${exp_vCont_s} vCont;r=${exp_vCont_r}"
set r_counter 0
set s_counter 0
+ set ret 1
gdb_test_multiple $cmd $test {
-re "vCont;s\[^\r\n\]*Packet received: T\[\[:xdigit:\]\]\[\[:xdigit:\]\]" {
incr s_counter
@@ -40,6 +42,7 @@ proc exec_cmd_expect_vCont_count { cmd exp_vCont_s exp_vCont_r } {
-re "$gdb_prompt $" {
if { $r_counter == ${exp_vCont_r} && $s_counter == ${exp_vCont_s} } {
pass $test
+ set ret 0
} else {
fail $test
}
@@ -47,4 +50,5 @@ proc exec_cmd_expect_vCont_count { cmd exp_vCont_s exp_vCont_r } {
}

gdb_test_no_output "set debug remote 0" ""
+ return $ret
}
--
1.7.7.6