Approved by fnasser@redhat.com:

2002-01-21  Fred Fish  <fnf@redhat.com>
        * gdb.base/maint.exp: Simplify the "maint info breakpoints" test to
        optionally accept the "shlib events" variation.
This commit is contained in:
Fred Fish 2002-01-21 20:25:18 +00:00
parent 3d74b771bd
commit aaf320fa4a
2 changed files with 11 additions and 25 deletions

View File

@ -1,3 +1,8 @@
2002-01-21 Fred Fish <fnf@redhat.com>
* gdb.base/maint.exp: Simplify the "maint info breakpoints" test to
optionally accept the "shlib events" variation.
2002-01-21 Jim Blandy <jimb@redhat.com> 2002-01-21 Jim Blandy <jimb@redhat.com>
* gdb.base/ending-run.c (main): Avoid messing with setvbuf; just * gdb.base/ending-run.c (main): Avoid messing with setvbuf; just

View File

@ -415,33 +415,14 @@ gdb_expect {
send_gdb "maint info breakpoints\n" send_gdb "maint info breakpoints\n"
gdb_expect { 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 $"\ -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" } { pass "maint info breakpoints" }
-re ".*$gdb_prompt $" { fail "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 $"\
timeout { fail "(timeout) maint info breakpoints" } { pass "maint info breakpoints (with shlib events)" }
-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" send_gdb "maint print\n"
gdb_expect { gdb_expect {
-re "\"maintenance print\" must be followed by the name of a print command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\ -re "\"maintenance print\" must be followed by the name of a print command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\