diff options
| author | Michael Snyder <msnyder@vmware.com> | 2010-05-27 23:44:51 +0000 |
|---|---|---|
| committer | Michael Snyder <msnyder@vmware.com> | 2010-05-27 23:44:51 +0000 |
| commit | 02746bbc9f260f92b3abb96d862f4e75fd6f3fc0 (patch) | |
| tree | ed11da9352953a731de7da35b050de94f2979877 /gdb/testsuite/gdb.base/watchpoint.exp | |
| parent | 2245442480a7de9c1e2364416b928500ad87bcab (diff) | |
| download | gdb-02746bbc9f260f92b3abb96d862f4e75fd6f3fc0.zip gdb-02746bbc9f260f92b3abb96d862f4e75fd6f3fc0.tar.gz gdb-02746bbc9f260f92b3abb96d862f4e75fd6f3fc0.tar.bz2 | |
2010-05-27 Michael Snyder <msnyder@msnyder-server.eng.vmware.com>
* gdb.base/relational.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/relocate.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/restore.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/return.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/return2.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/sepdebug.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/setshow.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/setvar.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/shlib-call.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/shreloc.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/sigall.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/sigbpt.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/signull.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/so-impl-ld.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/varargs.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/volatile.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/watch_thread_num.exp: Replace uses of send_gdb / gdb_expect.
* gdb.base/watchpoint.exp: Replace uses of send_gdb / gdb_expect.
Diffstat (limited to 'gdb/testsuite/gdb.base/watchpoint.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint.exp | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index b53faef..cada4ba 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -161,40 +161,21 @@ proc test_simple_watchpoint {} { # watches without a running inferior. The following testpoints used # to be in [initialize]. # - send_gdb "watch ival3\n" - gdb_expect { - -re ".*\[Ww\]atchpoint 3: ival3\r\n$gdb_prompt $" { - pass "set watchpoint on ival3" - } - -re ".*$gdb_prompt $" { fail "set watchpoint on ival3" } - timeout { fail "set watchpoint on ival3 (timeout)" } - } + gdb_test "watch ival3" \ + "\[Ww\]atchpoint 3: ival3" \ + "set watchpoint on ival3" set wp_set 1 - send_gdb "info watch\n" - gdb_expect { - -re "3\[ \]*.*watchpoint.*ival3\r\n$gdb_prompt $" { - pass "watchpoint found in watchpoint/breakpoint table" - } - -re ".*$gdb_prompt $" { - fail "watchpoint found in watchpoint/breakpoint table" - } - timeout { - fail "watchpoint found in watchpoint/breakpoint table" - } - } + gdb_test "info watch" \ + "3\[ \]*.*watchpoint.*ival3" \ + "watchpoint found in watchpoint/breakpoint table" # After installing the watchpoint, we disable it until we are ready # to use it. This allows the test program to run at full speed until # we get to the first marker function. - send_gdb "disable 3\n" - gdb_expect { - -re "disable 3\[\r\n\]+$gdb_prompt $" { pass "disable watchpoint" } - -re ".*$gdb_prompt $" { fail "disable watchpoint" } - timeout { fail "disable watchpoint (timeout)" } - } + gdb_test "disable 3" "disable 3" "disable watchpoint" } # After reaching the marker function, enable the watchpoint. @@ -455,6 +436,7 @@ proc test_watchpoint_triggered_in_syscall {} { # If we send_gdb "123\n" before gdb has switched the tty, then it goes # to gdb, not the inferior, and we lose. So that is why we have # watchpoint.c prompt us, so we can wait for that prompt. + send_gdb "continue\n"; gdb_expect { -re "Continuing\\.\r\ntype stuff for buf now:" { |