Update years in copyright notice for the GDB files.

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.java / jmisc.exp

diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp
index 50d32db00b677f8d8270ea57cedb777e997bfc62..7eb753075f2cd5915716b0a1e5a6464d9ef7980e 100644 (file)
--- a/gdb/testsuite/gdb.java/jmisc.exp
+++ b/gdb/testsuite/gdb.java/jmisc.exp
@@ -1,4 +1,4 @@
-# Copyright 2000, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2000-2013 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
@@ -16,53 +16,26 @@
 # This file was written by Anthony Green. (green@redhat.com)
 #
 
-if $tracelevel then {
-       strace $tracelevel
-}
-
 load_lib "java.exp"
 
 if { [skip_java_tests] } { continue }
 
-set testfile "jmisc"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if {[compile_java_from_source ${srcfile} ${binfile} "-g"] != ""} {
+standard_testfile .java
+if {[compile_java_from_source $srcdir/$subdir/$srcfile $binfile "-g"] != ""} {
     continue
 }
 
-# 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_load $binfile
 
 gdb_test "set print sevenbit-strings" ".*"
 
-if ![set_lang_java] then {
+if [set_lang_java] then {
     # Ref PR gdb:java/1565.  Don't use the simpler "break jmisc.main".
     # As of 2004-02-24 it wasn't working and is being tested separatly.
     # Before GCJ 4.1 (approximately) the demangled name did not include
@@ -70,40 +43,31 @@ if ![set_lang_java] then {
     # signature.
     runto_main
     set function "${testfile}.main(java.lang.String\[\])"
-    gdb_breakpoint "\'$function\'" { allow-pending }
-    gdb_breakpoint "\'${function}void\'" { allow-pending }
+    gdb_breakpoint "$function" allow-pending
+    gdb_breakpoint "${function}void" allow-pending
     gdb_continue_to_breakpoint $function
 
-    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]+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
+    gdb_test_multiple "ptype jmisc" "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 "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 }
     }
 
-    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 }
-    }
+    gdb_test "p args" \
+       "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+"
 
-    send_gdb "p *args\n"
-    gdb_expect {   
-       -re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $"                                                             { pass "p *args" }
+    gdb_test_multiple "p *args" "p *args" {
+       -re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $" {
+           pass "p *args"
+       }
        -re "\\\$2 = cannot find java.lang.Object.*$gdb_prompt $" {
            # Sometimes GCC 4.x does not emit the necessary information
            # about java.lang.Object.
            kfail "p *args" gdb/2214
        }
-       -re ".*$gdb_prompt $"             { fail "p *args" }
-       timeout { fail "p *args (timeout)" ; return }
     }
 
     # The idea of running to 'exit' is that 'exit' is in a different
@@ -133,4 +97,8 @@ if ![set_lang_java] then {
            }
        }
     }
+
+    # Test a non-mathing return type really fails the look up.
+    gdb_test_no_output "set breakpoint pending off"
+    gdb_test {break jmisc.main(java.lang.String[])int} {Function "jmisc\.main\(java\.lang\.String\[\]\)int" not defined\.}
 }