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: 321099c665bf
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 497c46408396
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 12, 2016

  1. 1
    Copy the full SHA
    e2be517 View commit details
  2. Copy the full SHA
    497c464 View commit details
Showing with 16 additions and 11 deletions.
  1. +16 −11 tool/jt.rb
27 changes: 16 additions & 11 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -45,12 +45,17 @@ def self.graal_locations
yield File.expand_path(from_branch) if from_branch

rel_java_bin = "bin/java" # "jre/bin/javao"
%w[dk re].each { |kind|
["", "../", "../../"].each { |prefix|
['', '../', '../../'].each do |prefix|
%w[dk re].each do |kind|
path = "#{prefix}graalvm-#{GRAALVM_VERSION}-#{kind}/#{rel_java_bin}"
yield File.expand_path(path, JRUBY_DIR)
}
}
end
end

['', '../', '../../'].each do |prefix|
path = Dir["#{prefix}graal/jvmci/jdk1.8.*/product/#{rel_java_bin}"].sort.last
yield File.expand_path(path, JRUBY_DIR) if path
end
end

def self.find_graal
@@ -464,15 +469,15 @@ def test(*args)
when nil
test_tck
test_specs('run')
# test_mri # TODO (pitr-ch 29-Mar-2016): temporarily disabled
test_integration({'HAS_REDIS' => 'true'}, 'all')
test_gems
# test_mri # TODO (pitr-ch 29-Mar-2016): temporarily disabled since it uses refinements
test_integration
test_gems env: { 'HAS_REDIS' => 'true' }
test_compiler
test_cexts if ENV['SULONG_DIR']
when 'compiler' then test_compiler(*rest)
when 'cexts' then test_cexts(*rest)
when 'integration' then test_integration({}, *rest)
when 'gems' then test_gems({}, *rest)
when 'integration' then test_integration(*rest)
when 'gems' then test_gems(*rest)
when 'specs' then test_specs('run', *rest)
when 'tck' then
args = []
@@ -543,7 +548,7 @@ def test_cexts(*args)
end
private :test_cexts

def test_integration(env, *args)
def test_integration(*args, env: {})
env_vars = env
jruby_opts = []

@@ -561,7 +566,7 @@ def test_integration(env, *args)
end
private :test_integration

def test_gems(env, *args)
def test_gems(*args, env: {})
env_vars = env
jruby_opts = []