Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 30742d9dcada
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7a20145449ab
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 21, 2016

  1. Typo.

    @chrisseaton
    chrisseaton committed Jan 21, 2016
    Copy the full SHA
    7544128 View commit details

  2. [Truffle] --no-java-cmd in test compiler

    @chrisseaton
    chrisseaton committed Jan 21, 2016
    3
    Copy the full SHA
    7a20145 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 tool/jt.rb
4 changes: 2 additions & 2 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -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