gdb/testsuite/

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

diff --git a/gdb/testsuite/lib/java.exp b/gdb/testsuite/lib/java.exp
index 7916772e0be3de2714687f010d2c4da34a1b0131..c45af359229e7e810e68123cd32d3bc9a685d0d5 100644 (file)
--- a/gdb/testsuite/lib/java.exp
+++ b/gdb/testsuite/lib/java.exp
@@ -1,21 +1,20 @@
 # This test code is part of GDB, the GNU debugger.
 
-# Copyright 1998, 1999, 2000, 2003, 2004, 2006, 2007
+# Copyright 1998, 1999, 2000, 2003, 2004, 2006, 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/>.
 
 load_lib "libgloss.exp"
 
@@ -46,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
@@ -91,31 +90,19 @@ 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 x [target_compile $srcfile ${binfile} executable $args]
-    if { $x != "" } {
-       verbose "target_compile failed: $x" 2
-       return "$errname compilation from source";
-    }
+    set result [target_compile $srcfile ${binfile} executable $args]
+    gdb_compile_test $srcfile $result
+    return $result
 }
 
 # Local Variables: