aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Manson <manson@cygnus>1997-04-09 05:54:15 +0000
committerBob Manson <manson@cygnus>1997-04-09 05:54:15 +0000
commit5f4c2f2db9ae66707d8a0a7ad587fceb90c69b21 (patch)
treeb832cab49a87da47df230df440ece6a379b0b3b5
parent614fb1b421c0f8b37c471b54af781605f0a2f142 (diff)
downloadgdb-5f4c2f2db9ae66707d8a0a7ad587fceb90c69b21.zip
gdb-5f4c2f2db9ae66707d8a0a7ad587fceb90c69b21.tar.gz
gdb-5f4c2f2db9ae66707d8a0a7ad587fceb90c69b21.tar.bz2
* gdb.base/watchpoint.exp(test_watchpoint_triggered_in_syscall):
Don't call gdb_test when the command doesn't return to a gdb prompt. Oops.
-rw-r--r--gdb/testsuite/ChangeLog3
-rw-r--r--gdb/testsuite/gdb.base/watchpoint.exp11
2 files changed, 12 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3df4bf0..fb0c01b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
Tue Apr 8 19:33:20 1997 Bob Manson <manson@charmed.cygnus.com>
+ * gdb.base/watchpoint.exp(test_watchpoint_triggered_in_syscall):
+ Don't call gdb_test when the command doesn't return to a gdb prompt.
+
* lib/gdb.exp(gdb_stop_suppressing_tests): Don't print gratuitous
"Tests restarted" messages.
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index ffb0644..574a9eb 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -394,8 +394,15 @@ 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.
- if [gdb_test "continue" "Continuing\\.\r\ntype stuff for buf now:" "continue to read" ] {
- return ;
+ send_gdb "continue\n";
+ gdb_expect {
+ -re "Continuing\\.\r\ntype stuff for buf now:" {
+ pass "continue to read"
+ }
+ default {
+ fail "continue to read";
+ return ;
+ }
}
send_gdb "123\n"