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: c2d72a3b4cd6
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e55ba7979438
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 9, 2018

  1. Revert "Try disabling compressed OOPs to pass the ripper rlimit test." 

    This reverts commit d2f4f0c.
    @headius
    headius committed Jan 9, 2018
    Copy the full SHA
    e55ba79 View commit details
Showing with 0 additions and 10 deletions.
  1. +0 −10 rakelib/test.rake
10 changes: 0 additions & 10 deletions rakelib/test.rake
View file
Original file line number Diff line number Diff line change
@@ -86,33 +86,23 @@ namespace :test do

namespace :mri do
mri_test_files = File.readlines('test/mri.index').grep(/^[^#]\w+/).map(&:chomp).join(' ')

# We disable compressed oops because it can push native heap allocations beyond rlimit,
# as in https://gist.github.com/headius/88d7f5449049794e286aab364de9830d.
# See https://bugs.openjdk.java.net/browse/JDK-8187709.
java_opts = "#{ENV['JAVA_OPTS']} -XX:-UseCompressedOops"

task :int do
ENV['JRUBY_OPTS'] = "#{ENV['JRUBY_OPTS']} -Xbacktrace.style=mri -Xdebug.fullTrace -X-C"
ENV['JAVA_OPTS'] = java_opts
ruby "test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} --excludes=test/mri/excludes -q -- #{mri_test_files}"
end

task :fullint do
ENV['JRUBY_OPTS'] = "#{ENV['JRUBY_OPTS']} -Xbacktrace.style=mri -Xdebug.fullTrace -X-C -Xjit.threshold=0 -Xjit.background=false"
ENV['JAVA_OPTS'] = java_opts
ruby "test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} --excludes=test/mri/excludes -q -- #{mri_test_files}"
end

task :jit do
ENV['JRUBY_OPTS'] = "#{ENV['JRUBY_OPTS']} -Xbacktrace.style=mri -Xdebug.fullTrace -Xjit.threshold=0 -Xjit.background=false #{get_meta_size.call()}"
ENV['JAVA_OPTS'] = java_opts
ruby "test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} --excludes=test/mri/excludes -q -- #{mri_test_files}"
end

task :aot do
ENV['JRUBY_OPTS'] = "#{ENV['JRUBY_OPTS']} -Xbacktrace.style=mri -Xdebug.fullTrace -X+C -Xjit.background=false #{get_meta_size.call()}"
ENV['JAVA_OPTS'] = java_opts
ruby "test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} --excludes=test/mri/excludes -q -- #{mri_test_files}"
end