[Truffle] jruby+truffle_runner: add --graal option to run on graal

jruby · Sep 2, 2015 · d6c55e1 · d6c55e1
1 parent 6bb6fe6
commit d6c55e1
Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/tool/truffle/jruby_truffle_runner/gem_configurations/activesupport.yaml b/tool/truffle/jruby_truffle_runner/gem_configurations/activesupport.yaml
@@ -2,6 +2,7 @@
 :global:
   # default ../jruby/bin/ruby won't work since activesupport is one more dir deeper
   :jruby_truffle_path: '../../jruby/bin/jruby'
+  :graal_path: '../../graalvm-jdk1.8.0/bin/java'
 :setup:
   :file:
     shims.rb: |

diff --git a/tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb b/tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb
@@ -40,6 +40,7 @@ class JRubyTruffleRunner
             truffle_bundle_path: ['--truffle-bundle-path NAME', 'Bundle path', assign_new_value, 'jruby+truffle_bundle'],
             jruby_truffle_path:  ['--jruby-truffle-path PATH', 'Path to JRuby+Truffle bin/jruby', assign_new_value,
                                   '../jruby/bin/jruby'],
+            graal_path:          ['--graal-path PATH', 'Path to Graal', assign_new_value, '../graalvm-jdk1.8.0/bin/java'],
             mock_load_path:      ['--mock-load-path PATH', 'Root path for all mocks/monkey-patches which is prepended in $:',
                                   assign_new_value, 'mocks']
         },
@@ -52,6 +53,7 @@ class JRubyTruffleRunner
         run:    {
             help:       ['-h', '--help', 'Show this message', assign_new_value, false],
             test:       ['-t', '--test', 'Do not use Truffle use plain JRuby', assign_new_value, false],
+            graal:      ['-g', '--graal', 'Run on graal', assign_new_value, false],
             debug:      ['-d', '--debug', 'JVM remote debugging', assign_new_value, false],
             require:    ['-r', '--require FILE', 'Files to require, same as Ruby\'s -r', add_to_array, []],
             load_path:  ['-I', '--load-path LOAD_PATH', 'Paths to add to load path, same as Ruby\'s -I', add_to_array, []],
@@ -280,7 +282,11 @@ def subcommand_run(rest)
         *@options[:run][:require].map { |v| '-r ' + v }
     ].compact.join(' ')
 
-    cmd = [@options[:global][:jruby_truffle_path], cmd_options, *rest].join(' ')
+    cmd = [("JAVACMD=#{@options[:global][:graal_path]}" if @options[:run][:graal]),
+           @options[:global][:jruby_truffle_path],
+           cmd_options,
+           *rest
+    ].compact.join(' ')
 
     exit execute_cmd(cmd, fail: false, print_always: true)
   end