From 11422c8666806d85f2ecd64002358874d55ea8e8 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 27 Jun 2004 00:41:39 +0000 Subject: [PATCH] 2004-06-26 Andrew Cagney Test PR java/1567 and PR java/1565. * gdb.java/jmain.exp, gdb.java/jmain.java: New files. * gdb.java/jmisc2.exp: Delete file. --- gdb/testsuite/ChangeLog | 6 ++ gdb/testsuite/gdb.java/jmain.exp | 66 ++++++++++++++++++++++ gdb/testsuite/gdb.java/jmain.java | 7 +++ gdb/testsuite/gdb.java/jmisc2.exp | 91 ------------------------------- 4 files changed, 79 insertions(+), 91 deletions(-) create mode 100644 gdb/testsuite/gdb.java/jmain.exp create mode 100644 gdb/testsuite/gdb.java/jmain.java delete mode 100644 gdb/testsuite/gdb.java/jmisc2.exp diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 628a926f07..9c8f3239f8 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-06-26 Andrew Cagney + + Test PR java/1567 and PR java/1565. + * gdb.java/jmain.exp, gdb.java/jmain.java: New files. + * gdb.java/jmisc2.exp: Delete file. + 2004-06-26 Michael Chastain * gdb.hp/gdb.base-hp/reg.exp: Update copyright notice. diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp new file mode 100644 index 0000000000..942099d339 --- /dev/null +++ b/gdb/testsuite/gdb.java/jmain.exp @@ -0,0 +1,66 @@ +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# This file was based on jmisc.exp which in turn was written by +# Anthony Green. (green@redhat.com) + +if $tracelevel then { + strace $tracelevel +} + +load_lib "java.exp" + +set testfile "jmain" +set srcfile ${srcdir}/$subdir/${testfile}.java +set binfile ${objdir}/${subdir}/${testfile} +if { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } { + untested "Couldn't compile ${srcfile}" + return -1 +} + +set prms_id 0 +set bug_id 0 + +# Start with a fresh gdb. + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir + +gdb_test "set print sevenbit-strings" ".*" + +# Check that plain old "main" works. The load should both set the +# language to java and (since --main=jmain), some how set the scope to +# jmain's main. + +# Where the breakpoint should always land + +set bpmain "Breakpoint .* file .*jmain.java, line 6\." + +gdb_load "${binfile}" +setup_kfail *-*-* java/1567 +gdb_test "break main" "${bpmain}" + +# Check that an unqualified "main" works. + + +gdb_load "${binfile}" +setup_kfail *-*-* java/1565 +gdb_test "break jmain.main" "${bpmain}" + +# Check that a fully qualified "main" works. +gdb_load "${binfile}" +gdb_test "break \'${testfile}.main(java.lang.String\[\])\'" "${bpmain}" diff --git a/gdb/testsuite/gdb.java/jmain.java b/gdb/testsuite/gdb.java/jmain.java new file mode 100644 index 0000000000..ee5c8bb00c --- /dev/null +++ b/gdb/testsuite/gdb.java/jmain.java @@ -0,0 +1,7 @@ +public class jmain +{ + public static void main (String[] args) + { + return; + } +} diff --git a/gdb/testsuite/gdb.java/jmisc2.exp b/gdb/testsuite/gdb.java/jmisc2.exp deleted file mode 100644 index 2eeb99df7a..0000000000 --- a/gdb/testsuite/gdb.java/jmisc2.exp +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Please email any bugs, comments, and/or additions to this file to: -# bug-gdb@prep.ai.mit.edu - -# This file was written by Anthony Green. (green@redhat.com) -# - -if $tracelevel then { - strace $tracelevel -} - -load_lib "java.exp" - -set testfile "jmisc" -set srcfile ${srcdir}/$subdir/${testfile}.java -set binfile ${objdir}/${subdir}/${testfile} -if { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } { - untested "Couldn't compile ${srcfile}" - return -1 -} - -# Set the current language to java. This counts as a test. If it -# fails, then we skip the other tests. - -proc set_lang_java {} { - global gdb_prompt - global binfile objdir subdir - - verbose "loading file '$binfile'" - gdb_load $binfile - - send_gdb "set language java\n" - gdb_expect { - -re ".*$gdb_prompt $" {} - timeout { fail "set language java (timeout)" ; return 0 } - } - - return [gdb_test "show language" ".* source language is \"java\".*" \ - "set language to \"java\""] -} - -set prms_id 0 -set bug_id 0 - -# Start with a fresh gdb. - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir - -gdb_test "set print sevenbit-strings" ".*" - -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 ".*$gdb_prompt $" { fail "ptype jmisc" } - timeout { fail "ptype jmisc (timeout)" ; return } - } - - runto ${testfile}.main(java.lang.String\[\]) - - send_gdb "p args\n" - gdb_expect { - -re "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+\[\r\n\ \t]+$gdb_prompt $" { pass "p args" } - -re ".*$gdb_prompt $" { fail "p args" } - timeout { fail "p args (timeout)" ; return } - } - - send_gdb "p *args\n" - gdb_expect { - -re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $" { pass "p *args" } - -re ".*$gdb_prompt $" { fail "p *args" } - timeout { fail "p *args (timeout)" ; return } - } -}