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

Commits on Apr 28, 2015

  1. [Truffle] Reorder priorities when searching for Graal.

    @chrisseaton
    chrisseaton committed Apr 28, 2015
    Copy the full SHA
    a5d291d View commit details

  2. [Truffle] Restore jt test fast, as it will take me ages to unlearn th… 

    …at one.
    @chrisseaton
    chrisseaton committed Apr 28, 2015
    Copy the full SHA
    96f075a View commit details
Showing with 5 additions and 12 deletions.
  1. +5 −12 tool/jt.rb
17 changes: 5 additions & 12 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -30,18 +30,12 @@ def self.graal_version
end

def self.find_graal
base_graal_path = if graal_version.include?('SNAPSHOT')
'basic-graal/jdk1.8.0_05/product'
else
'graalvm-jdk1.8.0'
end

graal_locations = [
ENV["GRAAL_BIN_#{mangle_for_env(git_branch)}"],
ENV['GRAAL_BIN'],
"#{base_graal_path}/bin/java",
"../#{base_graal_path}/bin/java",
"../../#{base_graal_path}/bin/java",
ENV["GRAAL_BIN_#{mangle_for_env(git_branch)}"],
"graalvm-jdk1.8.0/bin/java",
"../graalvm-jdk1.8.0/bin/java",
"../../graalvm-jdk1.8.0/bin/java",
].compact.map { |path| File.expand_path(path, JRUBY_DIR) }

not_found = -> {
@@ -259,10 +253,9 @@ def test_mri(*args)

def test(*args)
return test_pe(*args.drop(1)) if args.first == 'pe'

return test_mri(*args.drop(1)) if args.first == 'mri'

return test_specs(*args.drop(1)) if args.first == 'specs'
return test_specs(*args) if args.first == 'fast'

if args.size > 0
if args.first.start_with?('spec')