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

Commits on Dec 14, 2016

  1. Copy the full SHA
    a562e4e View commit details
  2. Copy the full SHA
    6ed1d90 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 test/mri_truffle.index
  2. +1 −1 tool/jt.rb
2 changes: 1 addition & 1 deletion test/mri_truffle.index
Original file line number Diff line number Diff line change
@@ -566,7 +566,7 @@ rdoc/test_rdoc_ri_driver.rb
rdoc/test_rdoc_ri_paths.rb
rdoc/test_rdoc_ruby_lex.rb
rdoc/test_rdoc_ruby_token.rb
rdoc/test_rdoc_rubygems_hook.rb
# rdoc/test_rdoc_rubygems_hook.rb # setup raises ArgumentError: Need a Gem::Version: nil
rdoc/test_rdoc_servlet.rb
rdoc/test_rdoc_single_class.rb
rdoc/test_rdoc_stats.rb
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -776,7 +776,7 @@ def test_mri(*args)
env_vars = {
"EXCLUDES" => "test/mri/excludes_truffle"
}
jruby_args = %w[-J-Xmx2G -Xtruffle.exceptions.print_java=true]
jruby_args = %w[-J-Xmx2G --jexceptions]

if args.count { |arg| !arg.start_with?('-') } == 0
args += File.readlines("#{JRUBY_DIR}/test/mri_truffle.index").grep(/^[^#]\w+/).map(&:chomp)