From: Bob Manson <manson@cygnus>
Date: Wed, 9 Apr 1997 05:54:15 +0000 (+0000)
Subject: 	* gdb.base/watchpoint.exp(test_watchpoint_triggered_in_syscall):
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f4c2f2db9ae66707d8a0a7ad587fceb90c69b21;p=binutils-gdb.git

	* 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.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3df4bf0d588..fb0c01bef5f 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 ffb06442a22..574a9ebcd5b 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"