Merge branch 'master' into truffle-head

jruby · Jan 21, 2016 · 08da5de · 08da5de
2 parents a6d9e07 + 7a20145
commit 08da5de
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -306,7 +306,7 @@ def run(*args)
 
     if USE_JRUBY_ECLIPSE
       jruby_bin = "#{JRUBY_DIR}/tool/jruby_eclipse"
-    if ENV['RUBY_BIN']
+    elsif ENV['RUBY_BIN']
       jruby_bin = ENV['RUBY_BIN']
     else
       jruby_bin = "#{JRUBY_DIR}/bin/jruby"
@@ -373,7 +373,7 @@ def test_mri(*args)
 
   def test_compiler(*args)
     env_vars = {}
-    env_vars["JAVACMD"] = Utilities.find_graal
+    env_vars["JAVACMD"] = Utilities.find_graal unless args.delete('--no-java-cmd')
     Dir["#{JRUBY_DIR}/test/truffle/compiler/*.sh"].each do |test_script|
       sh env_vars, test_script
     end