diff options
author | Michael Snyder <msnyder@vmware.com> | 2010-05-24 22:03:59 +0000 |
---|---|---|
committer | Michael Snyder <msnyder@vmware.com> | 2010-05-24 22:03:59 +0000 |
commit | ad3986f07b99393eb3a6282381d82cc1e8fe02fd (patch) | |
tree | 2fae34b761d0bc691347934f28d60eba28bbd03c /gdb/testsuite/gdb.base/consecutive.exp | |
parent | 6f875884e04b91b36840b991ce4509f9bf560367 (diff) |
2010-05-24 Michael Snyder <msnyder@vmware.com>
* gdb.base/call-ar-st.exp: Replace send_gdb with gdb_test.
* gdb.base/callfuncs.exp: Replace send_gdb with gdb_test.
* gdb.base/call-rt-st.exp: Replace send_gdb with gdb_test.
* gdb.base/call-signal-resume.exp: Replace send_gdb with gdb_test.
* gdb.base/call-strs.exp: Replace send_gdb with gdb_test.
* gdb.base/catch-syscall.exp: Replace send_gdb with gdb_test.
* gdb.base/charset.exp: Replace send_gdb with gdb_test.
* gdb.base/checkpoint.exp: Replace send_gdb with gdb_test.
* gdb.base/commands.exp: Replace send_gdb with gdb_test.
* gdb.base/condbreak.exp: Replace send_gdb with gdb_test.
* gdb.base/cond-exprs.exp: Replace send_gdb with gdb_test.
* gdb.base/consecutive.exp: Replace send_gdb with gdb_test.
* gdb.base/constvars.exp: Replace send_gdb with gdb_test.
* gdb.base/corefile.exp: Replace send_gdb with gdb_test.
Diffstat (limited to 'gdb/testsuite/gdb.base/consecutive.exp')
-rw-r--r-- | gdb/testsuite/gdb.base/consecutive.exp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp index b8850f03a4..5b5f26dd1a 100644 --- a/gdb/testsuite/gdb.base/consecutive.exp +++ b/gdb/testsuite/gdb.base/consecutive.exp @@ -60,27 +60,17 @@ gdb_test "continue" "Breakpoint $decimal, foo .*" \ set bp_addr 0 set stop_addr 0 -send_gdb "x /2i \$pc\n" -gdb_expect { +gdb_test_multiple "x /2i \$pc" "get breakpoint address for foo" { -re "=> $hex.*${nl} ($hex).*$gdb_prompt $" { set bp_addr $expect_out(1,string) pass "get breakpoint address for foo" } - -re ".*$gdb_prompt $" { - fail "get breakpoint address for foo" - return 0; - } - timeout { - fail "get breakpoint address for foo (timeout)" - return 0; - } } gdb_test "break \*$bp_addr" "Breakpoint $decimal at $bp_addr: file .*" \ "set bp, 2nd instr" -send_gdb "step\n" -gdb_expect { +gdb_test_multiple "step" "stopped at bp, 2nd instr" { -re "Breakpoint $decimal, ($hex) in foo.*$gdb_prompt $" { set stop_addr $expect_out(1,string) if [eval expr "$bp_addr == $stop_addr"] then { @@ -89,12 +79,5 @@ gdb_expect { fail "stopped at bp, 2nd instr (wrong address)" } } - -re ".*$gdb_prompt $" { - fail "stopped at bp, 2nd instr" - } - timeout { - fail "stopped at bp, 2nd instr (timeout)" - - } } |