[Truffle] Fix benchmark setup.

jruby · Oct 25, 2016 · e798498 · e798498
1 parent 9685ac6
commit e798498
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ci.hocon b/ci.hocon
@@ -238,8 +238,8 @@ weekly-bench-caps: {
 
 bench: {
   cmd: [mx, --dynamicimport, ruby-benchmarks, benchmark]
-  setup: [
-    ${mx_sclone} ["https://github.com/jruby/benchmark-interface.git", benchmark-interface],
+  setup: ${common.setup} [
+    ${mx_sclone} ["https://github.com/jruby/benchmark-interface.git", ../benchmark-interface],
     ${mx_sclone} [--revision, mx-config, "https://github.com/jruby/all-ruby-benchmarks.git", ../ruby-benchmarks]
   ]
 }
@@ -321,7 +321,7 @@ server-benchmarks: ${bench} {
   }
 
   run: [
-    [mx, benchmark, server]
+    ${bench.cmd} [server]
   ] ${post-process-and-upload-results}
   timelimit: "00:20:00"
 }

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -170,7 +170,11 @@ def self.find_benchmark(benchmark)
     if File.exist?(benchmark)
       benchmark
     else
-      File.join(find_repo('all-ruby-benchmarks'), benchmark)
+      begin
+        File.join(find_repo('ruby-benchmarks'), benchmark)
+      rescue
+        File.join(find_repo('all-ruby-benchmarks'), benchmark)
+      end
     end
   end