aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorStan Lo <stan001212@gmail.com>2023-06-02 14:54:02 +0100
committergit <svn-admin@ruby-lang.org>2023-06-02 13:54:07 +0000
commit83056817298d188937d157b54918e99b689fc12e (patch)
treec0f628e6c8d9bd537cc9eb8db2e383f4ed8b9bcf /test
parente38fb050fa585135d3f8f158e3c6ccc12cb1439c (diff)
downloadruby-83056817298d188937d157b54918e99b689fc12e.tar.gz
[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`.
Diffstat (limited to 'test')
-rw-r--r--test/irb/helper.rb5
-rw-r--r--test/irb/test_debug_cmd.rb1
2 files changed, 1 insertions, 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