2004-07-07 Jeff Johnston <jjohnstn@redhat.com>

        * gdb.java/jmisc.exp: Fix expected output of ptype to look for
        the jmisc() constructor instead of <init>.
        * gdb.java/jmisc1.exp: Ditto.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 989ce312c2fadf3608464a14ea84caf7bde502e1..f49dac41464d5084fc183e95d01cc890d0b6055f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * gdb.java/jmisc.exp: Fix expected output of ptype to look for
+       the jmisc() constructor instead of <init>.
+       * gdb.java/jmisc1.exp: Ditto.
+
 2004-07-07  Andrew Cagney  <cagney@gnu.org>
 
        * gdb.base/sigbpt.exp (stepi_out): Check for a single step

diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp
index 9fd220ff3074f6662e1cc71ab91c406482debf3d..9e32011d62b2bb8dbb8cf6174473827fdd886c87 100644 (file)
--- a/gdb/testsuite/gdb.java/jmisc.exp
+++ b/gdb/testsuite/gdb.java/jmisc.exp
@@ -1,4 +1,4 @@
-# Copyright 2000 Free Software Foundation, Inc.
+# Copyright 2000, 2004 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
@@ -72,7 +72,7 @@ if ![set_lang_java] then {
 
     send_gdb "ptype jmisc\n"   
     gdb_expect {   
-       -re "type = class jmisc  extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+void <init>\\(void\\);\[\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\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $"               { pass "ptype jmisc" }
        -re ".*$gdb_prompt $"             { fail "ptype jmisc" }
        timeout { fail "ptype jmisc (timeout)" ; return }
     }

diff --git a/gdb/testsuite/gdb.java/jmisc1.exp b/gdb/testsuite/gdb.java/jmisc1.exp
index dd5af98bbe25092f4495d065d4fa29200206230d..dab85c8e7a87896c6026aaf52418ff1d402a1c2d 100644 (file)
--- a/gdb/testsuite/gdb.java/jmisc1.exp
+++ b/gdb/testsuite/gdb.java/jmisc1.exp
@@ -1,4 +1,4 @@
-# Copyright 2002, 2003 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2004 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
@@ -70,7 +70,7 @@ if ![set_lang_java] then {
 
     send_gdb "ptype jmisc\n"   
     gdb_expect {   
-       -re "type = class jmisc  extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+void <init>\\(void\\);\[\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\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $"               { pass "ptype jmisc" }
        -re ".*$gdb_prompt $"             { fail "ptype jmisc" }
        timeout { fail "ptype jmisc (timeout)" ; return }
     }