diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-10-21 13:10:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 13:10:00 -0700 |
| commit | 54a5b99a007dd773aa25183fa29e7c87a86a29da (patch) | |
| tree | 0f7dd227cbf1a3e7600c19ad5820cd140f615223 /activesupport | |
| parent | e16a5fb508bf7833d7f7a9429ccd3b20990b7d4b (diff) | |
| parent | 9531e69f996643b57d25f6b9faa08346f011eed8 (diff) | |
| download | rails-54a5b99a007dd773aa25183fa29e7c87a86a29da.tar.gz rails-54a5b99a007dd773aa25183fa29e7c87a86a29da.tar.bz2 rails-54a5b99a007dd773aa25183fa29e7c87a86a29da.zip | |
Merge pull request #26859 from headius/mask_use_of_rubyvm_on_jruby
Skip test that depends on RubyVM when it is not available (JRuby).
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/test/executor_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/test/executor_test.rb b/activesupport/test/executor_test.rb index d409216206..03ec6020c3 100644 --- a/activesupport/test/executor_test.rb +++ b/activesupport/test/executor_test.rb @@ -192,6 +192,8 @@ class ExecutorTest < ActiveSupport::TestCase end def test_class_serial_is_unaffected + skip if !defined?(RubyVM) + hook = Class.new do define_method(:run) do nil |