Merge pull request #17088 from robin850/jruby-dev

Follow up to #16613

.travis.yml

@@ -12,7 +12,7 @@ rvm:
   - jruby
 env:
   global:
-    - JRUBY_OPTS='-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Djruby.compile.mode=OFF -J-Djruby.compile.invokedynamic=false -J-Xmx1024M'
+    - JRUBY_OPTS='-J-Xmx1024M'
   matrix:
     - "GEM=railties"
     - "GEM=ap"

actionmailer/Rakefile

@@ -10,6 +10,7 @@ Rake::TestTask.new { |t|
   t.pattern = 'test/**/*_test.rb'
   t.warning = true
   t.verbose = true
+  t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 }
 
 namespace :test do

actionpack/Rakefile

@@ -16,6 +16,7 @@ Rake::TestTask.new do |t|
 
   t.warning = true
   t.verbose = true
+  t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 end
 
 namespace :test do

actionview/Rakefile

@@ -21,6 +21,7 @@ namespace :test do
     t.test_files = Dir.glob('test/template/**/*_test.rb').sort
     t.warning = true
     t.verbose = true
+    t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
   end
 
   namespace :integration do
@@ -30,6 +31,7 @@ namespace :test do
       t.test_files = Dir.glob("test/activerecord/*_test.rb")
       t.warning = true
       t.verbose = true
+      t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
     end
 
     desc 'ActionPack Integration Tests'
@@ -38,6 +40,7 @@ namespace :test do
       t.test_files = Dir.glob("test/actionpack/**/*_test.rb")
       t.warning = true
       t.verbose = true
+      t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
     end
   end
 end

activejob/Rakefile

@@ -35,6 +35,7 @@ namespace :test do
       t.libs << 'test'
       t.test_files = FileList['test/cases/**/*_test.rb']
       t.verbose = true
+      t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
     end
 
     namespace :isolated do
@@ -52,6 +53,7 @@ namespace :test do
         t.libs << 'test'
         t.test_files = FileList['test/integration/**/*_test.rb']
         t.verbose = true
+        t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
       end
     end
   end

activemodel/Rakefile

@@ -9,6 +9,7 @@ Rake::TestTask.new do |t|
   t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort
   t.warning = true
   t.verbose = true
+  t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 end
 
 namespace :test do

activerecord/Rakefile

@@ -55,6 +55,7 @@ end
 
       t.warning = true
       t.verbose = true
+      t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
     }
 
     namespace :isolated do

activesupport/Rakefile

@@ -7,9 +7,9 @@ Rake::TestTask.new do |t|
   t.pattern = 'test/**/*_test.rb'
   t.warning = true
   t.verbose = true
+  t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 end
 
-
 namespace :test do
   task :isolated do
     Dir.glob("test/**/*_test.rb").all? do |file|

railties/Rakefile

@@ -29,6 +29,7 @@ Rake::TestTask.new('test:regular') do |t|
   t.pattern = 'test/**/*_test.rb'
   t.warning = true
   t.verbose = true
+  t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 end
 
 # Generate GEM ----------------------------------------------------------------------------