Re: [RFA] Only need one "maint info breakpoint" test

[Fernando Nasser <fnasser at redhat dot com>]

It looks reasonable to me.

Please check it in.

Thanks for the patch.
Fernando


Fred Fish wrote:
> 
> We really only need to run the "maint info breakpoints" test once and
> optionally accept the "shlib events" variation.  Also tweaked the
> whitespace for consistency with the other nearby tests.
> 
>   2002-01-05  Fred Fish  <fnf@redhat.com>
> 
>         * gdb.base/maint.exp: Simplify the "maint info breakpoints" test to
>         optionally accept the "shlib events" variation.
> 
> Index: gdb.base/maint.exp
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.base/maint.exp,v
> retrieving revision 1.9
> diff -c -p -r1.9 maint.exp
> *** maint.exp   2002/01/05 02:40:47     1.9
> --- maint.exp   2002/01/06 07:12:22
> *************** gdb_expect {
> *** 415,446 ****
> 
>   send_gdb "maint info breakpoints\n"
>   gdb_expect {
> !     -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\
> !                               { pass "maint info breakpoints" }
> !     -re ".*$gdb_prompt $"       { fail "maint info breakpoints" }
> !     timeout                   { fail "(timeout) maint info breakpoints" }
>   }
> -
> - # Try it again, and check for shlib event info.  Not supported everywhere.
> - if {! ([istarget "hppa*-*-hpux*"]
> -        || [istarget "*-*-linux*"]
> -        || [istarget "*-*-solaris*"])} then {
> -     setup_xfail "*-*-*"
> - }
> - send_gdb "maint info breakpoints\n"
> - gdb_expect  {
> -         -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\
> -                         { pass "maint info breakpoints" }
> -     -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $"\
> -           { pass "maint info breakpoints: shlib events" }
> -     -re ".*$gdb_prompt $" {
> -       fail "maint info breakpoints: shlib events"
> -     }
> -     timeout {
> -       fail "(timeout) maint info breakpoints: shlib events"
> -     }
> - }
> -
> 
>   send_gdb "maint print\n"
>   gdb_expect  {
> --- 415,427 ----
> 
>   send_gdb "maint info breakpoints\n"
>   gdb_expect {
> !       -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\
> !                       { pass "maint info breakpoints" }
> !       -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $"\
> !                       { pass "maint info breakpoints (with shlib events)" }
> !       -re ".*$gdb_prompt $"       { fail "maint info breakpoints" }
> !       timeout         { fail "(timeout) maint info breakpoints" }
>   }
> 
>   send_gdb "maint print\n"
>   gdb_expect  {

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