From 6a90a18e85dcf3883f32071df4712f68c86aef73 Mon Sep 17 00:00:00 2001
From: Elena Zannoni <ezannoni@kwikemart.cygnus.com>
Date: Fri, 7 Nov 2003 15:46:33 +0000
Subject: [PATCH] 2003-11-07 Elena Zannoni <ezannoni@redhat.com>
* gdb.cp/annota3.exp: Make sure we can match 'Hardware watchpoint'
as well as 'Watchpoint'.
---
gdb/testsuite/ChangeLog | 5 +++++
gdb/testsuite/gdb.cp/annota3.exp | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 62a0200f685..137deabb13e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-07 Elena Zannoni <ezannoni@redhat.com>
+
+ * gdb.cp/annota3.exp: Make sure we can match 'Hardware watchpoint'
+ as well as 'Watchpoint'.
+
2003-11-06 Elena Zannoni <ezannoni@redhat.com>
Reported by Jim Ingham <jingham@apple.com>:
diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp
index 431ed4f07bc..c75a2892037 100644
--- a/gdb/testsuite/gdb.cp/annota3.exp
+++ b/gdb/testsuite/gdb.cp/annota3.exp
@@ -196,7 +196,7 @@ gdb_expect_list "set watch on a.x" "$gdb_prompt$" {
#
send_gdb "next\n"
gdb_expect {
- -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\(\r\n\032\032frames-invalid\r\n\)+\r\n\032\032watchpoint 3\r\nWatchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\nmain \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" {
+ -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\(\r\n\032\032frames-invalid\r\n\)+\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\nmain \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" {
pass "watch triggered on a.x"
}
-re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {