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: 3b426d6f4049
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 49e97eb24727
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 22, 2016

  1. Copy the full SHA
    2e31d66 View commit details
  2. Copy the full SHA
    49e97eb View commit details
Original file line number Diff line number Diff line change
@@ -166,3 +166,5 @@
- rubygems
- shims
- openssl-stubs
:environment:
N: 1
Original file line number Diff line number Diff line change
@@ -93,3 +93,5 @@
- bigdecimal
- pathname
- openssl-stubs
:environment:
N: 1
6 changes: 4 additions & 2 deletions lib/ruby/truffle/jruby+truffle/lib/runner.rb
Original file line number Diff line number Diff line change
@@ -137,7 +137,8 @@ module OptionBlocks
exclude_pattern: ['--exclude-pattern REGEXP', 'Files matching the regexp will not be required by --require-pattern (applies to subsequent --require-pattern options)', ADD_TO_ARRAY, []],
load_path: ['-I', '--load-path LOAD_PATH', 'Paths to add to load path, same as Ruby\'s -I', ADD_TO_ARRAY, []],
executable: ['-S', '--executable NAME', 'finds and runs an executable of a gem', STORE_NEW_VALUE, nil],
jexception: ['--jexception', 'print Java exceptions', STORE_NEW_VALUE, false]
jexception: ['--jexception', 'print Java exceptions', STORE_NEW_VALUE, false],
environment: ['--environment NAME,VALUE', Array, 'Set environment variables', MERGE_TO_HASH, {}]
},
ci: {
batch: ['--batch FILE', 'Run batch of ci tests supplied in a file. One ci command options per line. If FILE is in or stdin it reads from $stdin.',
@@ -471,8 +472,9 @@ def subcommand_run(rest)
*@options[:run][:require].flat_map { |v| ['-r', v] }
].compact

env = {}
env = @options[:run][:environment]
env['JAVACMD'] = @options[:global][:graal_path] if @options[:run][:graal]
env.each { |k, v| env[k] = v.to_s }

cmd = [(env unless env.empty?),
@options[:run][:interpreter_path].to_s,