* lib/java.exp (java_init): Ignore $GCJ if it is empty.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c118286b36dea42f9ebeada4ff519853842e7964..7b2d8202ea74fb5a97b92484aa83f97ede98d1e6 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * lib/java.exp (java_init): Ignore $GCJ if it is empty.
+
 2009-07-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * lib/gdbserver-support.exp (gdbserver_start): Loop spawning

diff --git a/gdb/testsuite/lib/java.exp b/gdb/testsuite/lib/java.exp
index c92fc3707fb81be33b76b29a9750c33a108142e7..19619df6bfafbc74f0e6076ea71c209530765442 100644 (file)
--- a/gdb/testsuite/lib/java.exp
+++ b/gdb/testsuite/lib/java.exp
@@ -45,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