Merge pull request #19173 from robin850/rbx-build

Improve the Rubinius build

3 files changed, 6 insertions, 1 deletions

diff --git a/activesupport/lib/active_support/rescuable.rb b/activesupport/lib/active_support/rescuable.rb
index 1a02acd5b1..67aac32742 100644
--- a/activesupport/lib/active_support/rescuable.rb
+++ b/activesupport/lib/active_support/rescuable.rb
@@ -100,7 +100,7 @@ module ActiveSupport
         # a string, otherwise a NameError will be raised by the interpreter
         # itself when rescue_from CONSTANT is executed.
         klass = self.class.const_get(klass_name) rescue nil
-        klass ||= klass_name.constantize rescue nil
+        klass ||= (klass_name.constantize rescue nil)
         klass === exception if klass
       end
 
diff --git a/activesupport/test/core_ext/object/duplicable_test.rb b/activesupport/test/core_ext/object/duplicable_test.rb
index d37f4bd0d8..042f5cfb34 100644
--- a/activesupport/test/core_ext/object/duplicable_test.rb
+++ b/activesupport/test/core_ext/object/duplicable_test.rb
@@ -9,6 +9,9 @@ class DuplicableTest < ActiveSupport::TestCase
   ALLOW_DUP << BigDecimal.new('4.56')
 
   def test_duplicable
+    rubinius_skip "* Method#dup is allowed at the moment on Rubinius\n" \
+                  "* https://github.com/rubinius/rubinius/issues/3089"
+
     RAISE_DUP.each do |v|
       assert !v.duplicable?
       assert_raises(TypeError, v.class.name) { v.dup }
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 63d921e3b4..2f269a66f0 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -130,6 +130,8 @@ class TestJSONEncoding < ActiveSupport::TestCase
   end
 
   def test_process_status
+    rubinius_skip "https://github.com/rubinius/rubinius/issues/3334"
+
     # There doesn't seem to be a good way to get a handle on a Process::Status object without actually
     # creating a child process, hence this to populate $?
     system("not_a_real_program_#{SecureRandom.hex}")