From 23f4b0aa1ba05dd56230aa370b5b946b7cfa5627 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 7 Jul 2004 20:08:03 +0000 Subject: [PATCH] 2004-07-07 Jeff Johnston * gdb.java/jmisc.exp: Fix expected output of ptype to look for the jmisc() constructor instead of . * gdb.java/jmisc1.exp: Ditto. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.java/jmisc.exp | 4 ++-- gdb/testsuite/gdb.java/jmisc1.exp | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 989ce31..f49dac4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-07-07 Jeff Johnston + + * gdb.java/jmisc.exp: Fix expected output of ptype to look for + the jmisc() constructor instead of . + * gdb.java/jmisc1.exp: Ditto. + 2004-07-07 Andrew Cagney * 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 9fd220f..9e32011 100644 --- 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 \\(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 dd5af98..dab85c8 100644 --- 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 \\(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 } } -- 2.7.4