* gdb.java/jmisc.exp (ptype jmisc): Allow the constructor to

  appear in the output before main.
  Remove KFAIL for gdb/2215 aka bz 9320.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 092593ff37ce384084159adf51089fe7b0806663..e0e2ffef3dca04c8a57cd83b99a69a175f7625cc 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-26  Keith Seitz  <keiths@redhat.com>
+
+       * gdb.java/jmisc.exp (ptype jmisc): Allow the constructor to
+       appear in the output before main.
+       Remove KFAIL for gdb/2215 aka bz 9320.
+
 2010-03-30  Doug Evans  <dje@google.com>
 
        * gdb.arch/amd64-word.exp: Rename hex to hexr, the former is defined

diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp
index e3ab6576e9fdb5627926ac9fb18bf91260f3236e..638039392acb737afea1245e2310e84d046a0049 100644 (file)
--- a/gdb/testsuite/gdb.java/jmisc.exp
+++ b/gdb/testsuite/gdb.java/jmisc.exp
@@ -79,11 +79,8 @@ if ![set_lang_java] then {
     gdb_expect {   
        -re "type = class jmisc  extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $"
            { pass "ptype jmisc" }
-       -re "type = class jmisc  extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\)void;\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $" {
-           # Just because GCC includes the signature doesn't mean we
-           # should print it here.  We already show the return type.
-           kfail "ptype jmisc" gdb/2215
-       }
+       -re "type = class jmisc  extends java.lang.Object \{\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $"
+           { pass "ptype jmisc" }
        -re ".*$gdb_prompt $"             { fail "ptype jmisc" }
        timeout { fail "ptype jmisc (timeout)" ; return }
     }