Re: [RESUBMIT] [RFA] testsuite/gdb.c++/annota2.change: fix "delete bps" FAIL

[Fernando Nasser <fnasser at redhat dot com>]

Approved.

Thanks for catching it.


Michael Elizabeth Chastain wrote:
> 
> This is Sunday Project Patch #6.
> 
> This patch fixes a bogus regular expression in gdb.c++/annota2.exp.
> For the post-query annotation tag, the script expects any output that
> begins with a space character.  I changed this to expect the actual
> "post-query" output, which does not begin with a space at all.
> This fixes one FAIL across all native platforms.
> 
> I tested this on Red Hat Linux 7 native and Solaris 2.5.1 native with
> gcc 2.95.2 and gcc 3pre dated 2001-03-09.
> 
> OK to apply?
> 
> Michael
> 
> ===
> 
> 2001-03-12  Michael Chastain  <chastain@redhat.com>
> 
>         * gdb.c++/annota2.exp: Fix regular expression for "post-query".
> 
> ===
> 
> Index: gdb/testsuite/gdb.c++/annota2.exp
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/annota2.exp,v
> retrieving revision 1.2
> diff -c -3 -p -r1.2 annota2.exp
> *** gdb/testsuite/gdb.c++/annota2.exp   2001/03/06 08:21:52     1.2
> --- gdb/testsuite/gdb.c++/annota2.exp   2001/03/12 04:57:22
> ***************
> *** 1,4 ****
> ! #   Copyright 1999, 2000
>   #   Free Software Foundation, Inc.
> 
>   # This program is free software; you can redistribute it and/or modify
> --- 1,4 ----
> ! #   Copyright 1999, 2000, 2001
>   #   Free Software Foundation, Inc.
> 
>   # This program is free software; you can redistribute it and/or modify
> *************** gdb_expect {
> *** 139,145 ****
>     -re ".*Delete all breakpoints. \\(y or n\\) \r\n\032\032query.*$" {
>              send_gdb "y\n"
>              gdb_expect {
> !            -re " .*$gdb_prompt$" { pass "delete bps" }
>              -re ".*$gdb_prompt$" { fail "delete bps" }
>              timeout  { fail "delete bps (timeout)" }
>          }
> --- 139,145 ----
>     -re ".*Delete all breakpoints. \\(y or n\\) \r\n\032\032query.*$" {
>              send_gdb "y\n"
>              gdb_expect {
> !            -re "\r\n\032\032post-query\r\n$gdb_prompt$" { pass "delete bps" }
>              -re ".*$gdb_prompt$" { fail "delete bps" }
>              timeout  { fail "delete bps (timeout)" }
>          }

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