https://git.ruby-lang.org/ruby.git/commit/?id=544e37f184

From 544e37f184d38d52423d163b711cd626e53ff75b Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Mon, 6 Sep 2021 19:31:24 +0900
Subject: Simplify conditions for CoreAssertion initialization

---
 tool/lib/core_assertions.rb      | 7 ++-----
 tool/lib/test/unit/assertions.rb | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index 2e4235f..a670c77 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -24,13 +24,11 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/core_assertions.rb#L24
     end
 
     module CoreAssertions
+      require_relative 'envutil'
+
       if defined?(MiniTest)
-        require_relative 'envutil'
         # for ruby core testing
         include MiniTest::Assertions
-
-        # Compatibility hack for assert_raise
-        Test::Unit::AssertionFailedError = MiniTest::Assertion
       else
         module MiniTest
           class Assertion < Exception; end
@@ -38,7 +36,6 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/core_assertions.rb#L36
         end
 
         require 'pp'
-        require_relative 'envutil'
         include Test::Unit::Assertions
       end
 
diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb
index c61f296..b99fb19 100644
--- a/tool/lib/test/unit/assertions.rb
+++ b/tool/lib/test/unit/assertions.rb
@@ -303,5 +303,9 @@ EOT https://github.com/ruby/ruby/blob/trunk/tool/lib/test/unit/assertions.rb#L303
         template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) }
       end
     end
+
+    # Compatibility hack for assert_raise
+    AssertionFailedError = MiniTest::Assertion
+
   end
 end
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/