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

Commits on Sep 3, 2015

  1. [Truffle] jruby+truffle_runner: change default bundle path to .jruby+… 

    …truffle_bundle
    @pitr-ch
    pitr-ch committed Sep 3, 2015
    Copy the full SHA
    e8610d7 View commit details

  2. [Truffle] jruby+truffle_runner: use flat_map

    @pitr-ch
    pitr-ch committed Sep 3, 2015
    Copy the full SHA
    b2d8260 View commit details

  3. [Truffle] jruby+truffle_runner: do not polute stdout

    @pitr-ch
    pitr-ch committed Sep 3, 2015
    Copy the full SHA
    69231c8 View commit details

  4. [Truffle] jruby+truffle_runner: add default configuration for concurr… 

    …ent-ruby
    @pitr-ch
    pitr-ch committed Sep 3, 2015
    4
    Copy the full SHA
    7a99f1c View commit details
Showing with 25 additions and 4 deletions.
  1. +21 −0 tool/truffle/jruby_truffle_runner/gem_configurations/concurrent-ruby.yaml
  2. +4 −4 tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb
21 changes: 21 additions & 0 deletions tool/truffle/jruby_truffle_runner/gem_configurations/concurrent-ruby.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
:setup:
:file:
shims.rb: |
# stub methods caling #system
module Concurrent
module Utility
class ProcessorCounter
def compute_processor_count
2
end
def compute_physical_processor_count
2
end
end
end
end
:run:
:require:
- concurrent
- shims
8 changes: 4 additions & 4 deletions tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ class JRubyTruffleRunner
debug_port: ['--debug-port PORT', 'Debug port', assign_new_value, '51819'],
debug_option: ['--debug-option OPTION', 'Debug JVM option', assign_new_value,
'-J-agentlib:jdwp=transport=dt_socket,server=y,address=%d,suspend=y'],
truffle_bundle_path: ['--truffle-bundle-path NAME', 'Bundle path', assign_new_value, 'jruby+truffle_bundle'],
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'],
@@ -243,7 +243,7 @@ def eval_yaml_strings(value)

def subcommand_setup(rest)
bundle_path = File.expand_path @options[:global][:truffle_bundle_path]
bundle_installed = execute_cmd 'command -v bundle 2>/dev/null', fail: false
bundle_installed = execute_cmd 'command -v bundle 1>&2 2>/dev/null', fail: false

execute_cmd 'gem install bundler' unless bundle_installed

@@ -280,8 +280,8 @@ def subcommand_run(rest)
(format(@options[:global][:debug_option], @options[:global][:debug_port]) if @options[:run][:debug]),
('-Xtruffle.exceptions.print_java=true' if @options[:run][:jexception]),
'-r', "./#{@options[:global][:truffle_bundle_path]}/bundler/setup.rb",
*@options[:run][:load_path].map { |v| ['-I', v] }.flatten,
*@options[:run][:require].map { |v| ['-r', v] }.flatten
*@options[:run][:load_path].flat_map { |v| ['-I', v] },
*@options[:run][:require].flat_map { |v| ['-r', v] }
].compact

env = {}