Re: [PATCH/RFA] annota2.exp: accept different output

[Elena Zannoni <ezannoni at redhat dot com>]

Elena Zannoni writes:
 > 
 > On some platforms, when a watchpoint is hit, you get a 'Hardware
 > watchpoint' message instead of 'Watchpoint'. There are 2 patterns for
 > the same test depending on the number of "frames-invalid" printed, one
 > of the two was getting this right, the other wasn't.
 > 
 > Should this be committed to both branch and mainline?
 > 

committed to both.


 > elena
 > 
 > 2003-09-11  Elena Zannoni  <ezannoni@redhat.com>
 > 
 >         * gdb.cp/annota2.exp: Make sure we can match 'Hardware watchpoint'
 >         as well as 'Watchpoint'.
 > 
 > 
 > Index: annota2.exp
 > ===================================================================
 > RCS file: /cvs/uberbaum/gdb/testsuite/gdb.cp/annota2.exp,v
 > retrieving revision 1.1
 > diff -u -p -r1.1 annota2.exp
 > --- annota2.exp	23 Aug 2003 03:55:59 -0000	1.1
 > +++ annota2.exp	11 Sep 2003 19:37:48 -0000
 > @@ -193,7 +193,7 @@ gdb_expect {
 >  #
 >  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\032frames-invalid\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\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\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\032frames-invalid\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\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\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\032frames-invalid\r\n\r\n\032\032frames-invalid\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\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" \
 >  	   { pass "watch triggered on a.x" }