Copyright year update in most files of the GDB Project.

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

diff --git a/gdb/testsuite/lib/java.exp b/gdb/testsuite/lib/java.exp
index 5c1432fcd375195b2c144eabf916d6d2ebace076..57ff1e6559a9d2ea70dbf0660f04917ab2a737a0 100644 (file)
--- a/gdb/testsuite/lib/java.exp
+++ b/gdb/testsuite/lib/java.exp
@@ -1,4 +1,20 @@
-# Copyright (C) 1998, 1999 Red Hat, Inc.
+# This test code is part of GDB, the GNU debugger.
+
+# Copyright 1998-2000, 2003-2004, 2006-2012 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 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, see <http://www.gnu.org/licenses/>.
 
 load_lib "libgloss.exp"
 
@@ -29,7 +45,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
@@ -74,31 +90,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
+}
 
-    set x [target_compile $srcfile ${binfile} ${binfile} $args]
-    if { $x != "" } {
-       verbose "target_compile failed: $x" 2
-       return "$errname compilation from source";
+# Auxiliary function to set the language to java.
+# The result is 1 (true) for success, 0 (false) for failure.
+
+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: