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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e3c5dc8db995ee393583ad56140da2573e67c608..ddc088c9a4ed4d8b36210356d6727ed41601a77a 100644 (file)
--- 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 1ccc7129c9dc129e68f60af3fa433eaf6a2eb866..11a14c16db7491370125a3fd2fd5fa6a25a3653a 100644 (file)
--- 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 $"\