Update years in copyright notice for the GDB files.

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

diff --git a/gdb/testsuite/lib/java.exp b/gdb/testsuite/lib/java.exp
index 9ac8a501cfae394ae42e39e3a6d7e52fd974be24..bd24c25dff6447341c70ce60abd101675b76341b 100644 (file)
--- a/gdb/testsuite/lib/java.exp
+++ b/gdb/testsuite/lib/java.exp
@@ -1,7 +1,6 @@
 # This test code is part of GDB, the GNU debugger.
 
-# Copyright 1998, 1999, 2000, 2003, 2004, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# Copyright 1998-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
@@ -45,7 +44,7 @@ proc java_init { args } {
        if [info exists TOOL_EXECUTABLE] {
            set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
        } else {
-           if [info exists env(GCJ)] {
+           if { [info exists env(GCJ)] && $env(GCJ) != "" } {
                set GCJ_UNDER_TEST $env(GCJ)
            } else {
                global tool_root_dir
@@ -90,31 +89,33 @@ proc java_init { args } {
 #
 proc compile_java_from_source { srcfile binfile compile_args } {
     global GCJ_UNDER_TEST
-    global runtests
     global java_initialized
 
     if { $java_initialized != 1 } { java_init }
 
-    set errname [file rootname [file tail $srcfile]]
-    if {! [runtest_file_p $runtests $errname]} {
-        return
-    }
-
     set args "compiler=$GCJ_UNDER_TEST"
     lappend args "additional_flags=--main=[file rootname [file tail $srcfile]]"
     if { $compile_args != "" } {
        lappend args "additional_flags=$compile_args"
     }
 
-    if { $compile_args != "" } {
-       set errname "$errname $compile_args"
-    }
+    set result [target_compile $srcfile ${binfile} executable $args]
+    gdb_compile_test $srcfile $result
+    return $result
+}
+
+# Auxiliary function to set the language to java.
+# The result is 1 (true) for success, 0 (false) for failure.
 
-    set x [target_compile $srcfile ${binfile} executable $args]
-    if { $x != "" } {
-       verbose "target_compile failed: $x" 2
-       return "$errname compilation from source";
+proc set_lang_java {} {
+    if [gdb_test_no_output "set language java"] {
+       return 0
+    }
+    if [gdb_test "show language" ".* source language is \"java\"." \
+          "set language to \"java\""] {
+       return 0
     }
+    return 1;
 }
 
 # Local Variables: