This commit was manufactured by cvs2svn to create branch 'gdb_7_0-branch'.

[external/binutils.git] / gdb / testsuite / gdb.java / jmain.exp

diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp
index 79cb1dd..d834c20 100644 (file)
--- a/gdb/testsuite/gdb.java/jmain.exp
+++ b/gdb/testsuite/gdb.java/jmain.exp
@@ -1,18 +1,17 @@
-# Copyright 2000, 2004, 2007 Free Software Foundation, Inc.
+# Copyright 2000, 2004, 2007, 2008, 2009 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
+# the Free Software Foundation; either version 3 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.  
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was based on jmisc.exp which in turn was written by
 # Anthony Green. (green@redhat.com)
@@ -50,18 +49,46 @@ gdb_test "set print sevenbit-strings" ".*"
 
 set bpmain "Breakpoint .* file .*jmain.java, line 5\."
 
+# Where GCC PR 16439 puts the breakpoint.
+set earlybpmain "Breakpoint .* file .*jmain.java, line 4\."
+
 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}"
-setup_xfail *-*-* gcc/16439
-gdb_test "break \'${testfile}.main(java.lang.String\[\])\'" "${bpmain}"
+set cmd "break \'${testfile}.main(java.lang.String\[\])\'"
+set msg $cmd
+gdb_test_multiple $cmd $msg {
+    -re "${bpmain}\r\n$gdb_prompt $" {
+       pass $msg
+    }
+    -re "${earlybpmain}\r\n$gdb_prompt $" {
+       setup_xfail *-*-* gcc/16439
+       fail $msg
+    }
+    -re "Make breakpoint pending.* \\(y or \\\[n\\\]\\) $" {
+       gdb_test "n" "" ""
+
+       # Check again with a method signature at the end.
+       set cmd "break \'${testfile}.main(java.lang.String\[\])void\'"
+       set msg $cmd
+       gdb_test_multiple $cmd $msg {
+           -re "${bpmain}\r\n$gdb_prompt $" {
+               pass $msg
+           }
+           -re "${earlybpmain}\r\n$gdb_prompt $" {
+               setup_xfail *-*-* gcc/16439
+               fail $msg
+           }
+       }
+    }
+}
+