From 83056817298d188937d157b54918e99b689fc12e Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Fri, 2 Jun 2023 14:54:02 +0100
Subject: [PATCH] [ruby/irb] Require `test/lib` helpers from main test helper
 (https://github.com/ruby/irb/pull/595)

Because they are handled differently in `ruby/irb` and `ruby/ruby`.
---
 test/irb/helper.rb         | 5 +----
 test/irb/test_debug_cmd.rb | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/test/irb/helper.rb b/test/irb/helper.rb
index f4f969e889..55f9e083eb 100644
--- a/test/irb/helper.rb
+++ b/test/irb/helper.rb
@@ -3,6 +3,7 @@ require "pathname"
 
 begin
   require_relative "../lib/helper"
+  require_relative "../lib/envutil"
 rescue LoadError # ruby/ruby defines helpers differently
 end
 
@@ -66,10 +67,6 @@ module TestIRB
 
       yield
     ensure
-      begin
-        require_relative "../lib/envutil"
-      rescue LoadError # ruby/ruby defines EnvUtil differently
-      end
       EnvUtil.suppress_warning {
         ::Kernel.send(:alias_method, :require, :irb_original_require)
         ::Kernel.undef_method :irb_original_require
diff --git a/test/irb/test_debug_cmd.rb b/test/irb/test_debug_cmd.rb
index 74a7de38c2..3bc00638dd 100644
--- a/test/irb/test_debug_cmd.rb
+++ b/test/irb/test_debug_cmd.rb
@@ -9,7 +9,6 @@ end
 require "tempfile"
 require "tmpdir"
 
-require_relative "../lib/envutil"
 require_relative "helper"
 
 module TestIRB