[Truffle] jtr: do not fail when running without setup step

jruby · Apr 7, 2016 · 2fc27e3 · 2fc27e3 · eregon · Apr 9, 2016
1 parent 745ca33
commit 2fc27e3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/ruby/truffle/jruby+truffle/lib/runner.rb b/lib/ruby/truffle/jruby+truffle/lib/runner.rb
@@ -461,11 +461,12 @@ def subcommand_run(rest)
         ('-Xtruffle.exceptions.print_java=true' if @options[:run][:jexception])
     ]
 
-    cmd_options = [
+    bundler_setup = "./#{@options[:global][:truffle_bundle_path]}/bundler/setup.rb"
+    cmd_options   = [
         *(truffle_options unless @options[:run][:no_truffle]),
         (format(@options[:global][:debug_option], @options[:global][:debug_port]) if @options[:run][:debug]),
         *ruby_options,
-        '-r', "./#{@options[:global][:truffle_bundle_path]}/bundler/setup.rb",
+        *(['-r', bundler_setup] if File.exist? bundler_setup),
         *@options[:run][:load_path].flat_map { |v| ['-I', v] },
         *@options[:run][:require].flat_map { |v| ['-r', v] }
     ].compact