[PATCH RFA] annota1.exp: Fix "info break" test for 64-bit targets

[PATCH RFA] annota1.exp: Fix "info break" test for 64-bit targets

[Kevin Buettner]

In the annota1.exp test, the annotation level is set to 2 and 
"info break" is run.  On a 32-bit target, a portion of the output from
this command consists of the string "Address" followed by four spaces. 
But on a 64-bit target, "Address" is followed by 12 spaces.  The test
in question was attempting to match exactly 4 spaces.  I've revised it
to match four or more spaces.

Okay to commit?

	* gdb.base/annota1.exp (info break): Match four or more spaces
	after "Address".

Index: testsuite/gdb.base/annota1.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota1.exp,v
retrieving revision 1.5
diff -u -p -r1.5 annota1.exp
--- annota1.exp	2001/03/08 21:09:22	1.5
+++ annota1.exp	2001/06/01 01:57:02
@@ -115,7 +115,7 @@ gdb_expect {
 #
 send_gdb "info break\n" 
 gdb_expect {
- -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType           \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress    \r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1   \r\n\032\032field 1\r\nbreakpoint     \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny   \r\n\032\032field 4\r\n$hex \r\n\032\032field 5\r\nin main at ${srcdir}/${subdir}/${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \
+ -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType           \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress    +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1   \r\n\032\032field 1\r\nbreakpoint     \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny   \r\n\032\032field 4\r\n$hex \r\n\032\032field 5\r\nin main at ${srcdir}/${subdir}/${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \
 	{pass "breakpoint info"}
    -re ".*$gdb_prompt$" { fail "breakpoint info" }
    timeout { fail "breakpoint info (timeout)" }

Re: [PATCH RFA] annota1.exp: Fix "info break" test for 64-bit targets

[Fernando Nasser]

Kevin Buettner wrote:
> 
> In the annota1.exp test, the annotation level is set to 2 and
> "info break" is run.  On a 32-bit target, a portion of the output from
> this command consists of the string "Address" followed by four spaces.
> But on a 64-bit target, "Address" is followed by 12 spaces.  The test
> in question was attempting to match exactly 4 spaces.  I've revised it
> to match four or more spaces.
> 


Good catch!

> Okay to commit?
> 


Yes, please.

Fernando


>         * gdb.base/annota1.exp (info break): Match four or more spaces
>         after "Address".
> 
> Index: testsuite/gdb.base/annota1.exp
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota1.exp,v
> retrieving revision 1.5
> diff -u -p -r1.5 annota1.exp
> --- annota1.exp 2001/03/08 21:09:22     1.5
> +++ annota1.exp 2001/06/01 01:57:02
> @@ -115,7 +115,7 @@ gdb_expect {
>  #
>  send_gdb "info break\n"
>  gdb_expect {
> - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType           \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress    \r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1   \r\n\032\032field 1\r\nbreakpoint     \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny   \r\n\032\032field 4\r\n$hex \r\n\032\032field 5\r\nin main at ${srcdir}/${subdir}/${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \
> + -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType           \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress    +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1   \r\n\032\032field 1\r\nbreakpoint     \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny   \r\n\032\032field 4\r\n$hex \r\n\032\032field 5\r\nin main at ${srcdir}/${subdir}/${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \
>         {pass "breakpoint info"}
>     -re ".*$gdb_prompt$" { fail "breakpoint info" }
>     timeout { fail "breakpoint info (timeout)" }

-- 
Fernando Nasser
Red Hat Canada Ltd.                     E-Mail:  fnasser@redhat.com
2323 Yonge Street, Suite #300
Toronto, Ontario   M4P 2C9

Re: [PATCH RFA] annota1.exp: Fix "info break" test for 64-bit targets

[Kevin Buettner]

On May 31, 10:19pm, Fernando Nasser wrote:

> >         * gdb.base/annota1.exp (info break): Match four or more spaces
> >         after "Address".
> > 
> > Okay to commit?
> 
> Yes, please.

Committed.