* gdb.base/completion.exp: Recognize the more detailed error

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / maint.exp

diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index 145f71d3278e61754c7f0e239dbe9348f2e81a83..ac2e9f8752665682f0b32ae674849ba2aaa2c809 100644 (file)
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -1,4 +1,4 @@
-# Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -345,7 +345,7 @@ set timeout $old_timeout
 
 send_gdb "maint print type argc\n"
 gdb_expect  {
-        -re "type node $hex\r\nname .int. \\($hex\\)\r\ntagname .<NULL>. \\($hex\\)\r\ncode $hex \\(TYPE_CODE_INT\\)\r\nlength \[24\]\r\nupper_bound_type $hex \\(BOUND_SIMPLE\\)\r\nlower_bound_type $hex \\(BOUND_SIMPLE\\)\r\nobjfile $hex\r\ntarget_type $hex\r\npointer_type $hex\r\nreference_type $hex\r\ncv_type $hex\r\nas_type $hex\r\nflags $hex\r\nnfields 0 $hex\r\nvptr_basetype $hex\r\nvptr_fieldno -1\r\ntype_specific $hex\r\n$gdb_prompt $"\
+        -re "type node $hex\r\nname .int. \\($hex\\)\r\ntagname .<NULL>. \\($hex\\)\r\ncode $hex \\(TYPE_CODE_INT\\)\r\nlength \[24\]\r\nupper_bound_type $hex \\(BOUND_SIMPLE\\)\r\nlower_bound_type $hex \\(BOUND_SIMPLE\\)\r\nobjfile $hex\r\ntarget_type $hex\r\npointer_type $hex\r\nreference_type $hex\r\ntype_chain $hex\r\ninstance_flags $hex\r\nflags $hex\r\nnfields 0 $hex\r\nvptr_basetype $hex\r\nvptr_fieldno -1\r\ntype_specific $hex\r\n$gdb_prompt $"\
                         { pass "maint print type" }
         -re ".*$gdb_prompt $"       { fail "maint print type" }
         timeout         { fail "(timeout) maint print type" }
@@ -385,34 +385,43 @@ gdb_expect  {
         timeout         { fail "(timeout) maint info sections" }
         }
 
-send_gdb "maint info breakpoints\n"
+# Test for new option: maint info sections <section name>
+# If you don't have a .text section, this will require tweaking.
+send_gdb "maint info sections .text\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 ".*bss.*$gdb_prompt $"      { fail "maint info sections .text" }
+    -re ".*data.*$gdb_prompt $"     { fail "maint info sections .text" }
+    -re ".* .text .*$gdb_prompt $"  { pass "maint info sections .text" }
+    timeout               { fail "(timeout) maint info sections .text" }
 }
 
-# Try it again, and check for shlib event info.  Not supported everywhere.
-if {! ([istarget "hppa*-*-hpux*"] 
-       || [istarget "*-*-linux*"]
-       || [istarget "*-*-solaris*"])} then {
-    setup_xfail "*-*-*"
+# Test for new option: CODE section flag
+# If your data section is tagged CODE, xfail this test.
+send_gdb "maint info sections CODE\n"
+gdb_expect {
+    -re ".* .data .*$gdb_prompt $" { fail "maint info sections CODE" }
+    -re ".* .text .*$gdb_prompt $" { pass "maint info sections CODE" }
+    timeout              { fail "(timeout) maint info sections CODE" }
 }
-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"
-    }
+
+# Test for new option: DATA section flag
+# If your text section is tagged DATA, xfail this test.
+send_gdb "maint info sections DATA\n"
+gdb_expect {
+    -re ".* .text .*$gdb_prompt $" { fail "maint info sections DATA" }
+    -re ".* .data .*$gdb_prompt $" { pass "maint info sections DATA" }
+    timeout              { fail "(timeout) maint info sections DATA" }
 }
 
+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\[ \t\]+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  {
@@ -632,8 +641,8 @@ gdb_expect  {
 
 send_gdb "maint internal-error\n"
 gdb_expect  {
-    -re "Continue this debugging session.*\\(y or n\\) $" {
-       send_gdb "y\n"
+    -re "Quit this debugging session.*\\(y or n\\) $" {
+       send_gdb "n\n"
        gdb_expect {
            -re "Create a core file.*\\(y or n\\) $" {
                send_gdb "n\n"