diff options
| author | Fred Fish <fnf@specifix.com> | 2002-01-21 20:25:18 +0000 |
|---|---|---|
| committer | Fred Fish <fnf@specifix.com> | 2002-01-21 20:25:18 +0000 |
| commit | aaf320fa4ac11363de3d05bd5a239ec6463ffd24 (patch) | |
| tree | d97348b352b697855aaf1b76073c2e9e8bda7c34 /gdb | |
| parent | 3d74b771bdbf29aebb570a482839590ebce4da48 (diff) | |
| download | gdb-aaf320fa4ac11363de3d05bd5a239ec6463ffd24.zip gdb-aaf320fa4ac11363de3d05bd5a239ec6463ffd24.tar.gz gdb-aaf320fa4ac11363de3d05bd5a239ec6463ffd24.tar.bz2 | |
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.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/maint.exp | 31 |
2 files changed, 11 insertions, 25 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e3c5dc8..ddc088c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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> * gdb.base/ending-run.c (main): Avoid messing with setvbuf; just diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index 1ccc712..11a14c1 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -415,33 +415,14 @@ gdb_expect { 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" } + -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" } } -# 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 { -re "\"maintenance print\" must be followed by the name of a print command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\ |