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

Commits on Jun 15, 2016

  1. Copy the full SHA
    ddf6701 View commit details
  2. Copy the full SHA
    03e4f7a View commit details
Showing with 16 additions and 2 deletions.
  1. +16 −2 tool/jt.rb
18 changes: 16 additions & 2 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -144,6 +144,14 @@ def self.find_repo(name)
end
raise "Can't find the #{name} repo - clone it into the repository directory or its parent"
end

def self.find_benchmark(benchmark)
if File.exist?(File.join(JRUBY_DIR, benchmark))
benchmark
else
File.join(find_repo('all-ruby-benchmarks'), benchmark)
end
end

def self.find_gem(name)
["#{JRUBY_DIR}/lib/ruby/gems/shared/gems"].each do |dir|
@@ -267,7 +275,7 @@ def raw_sh(*args)
continue_on_failure = true
end
if !args.last.is_a?(Hash) || !args.last.delete(:no_print_cmd)
puts "$ #{printable_cmd(args)}"
STDERR.puts "$ #{printable_cmd(args)}"
end
timeout = nil
if args.last.is_a?(Hash)
@@ -942,10 +950,16 @@ def tarball(*options)
end

def benchmark(*args)
benchmark = args.pop
raise 'no benchmark given' unless benchmark
benchmark = Utilities.find_benchmark(benchmark)
raise 'benchmark not found' unless File.exist?(benchmark)
run '--graal',
'-I', "#{Utilities.find_gem('deep-bench')}/lib",
'-I', "#{Utilities.find_gem('benchmark-ips')}/lib",
"#{Utilities.find_gem('benchmark-interface')}/bin/benchmark", *args
"#{Utilities.find_gem('benchmark-interface')}/bin/benchmark",
benchmark,
*args
end

def check_ambiguous_arguments