jruby · Jun 15, 2016 · Jun 15, 2016
Showing with 16 additions and 2 deletions.

+16 −2 tool/jt.rb
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -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