diff --git a/test/irb/helper.rb b/test/irb/helper.rb index f4f969e88..55f9e083e 100644 --- a/test/irb/helper.rb +++ b/test/irb/helper.rb @@ -3,6 +3,7 @@ begin require_relative "../lib/helper" + require_relative "../lib/envutil" rescue LoadError # ruby/ruby defines helpers differently end @@ -66,10 +67,6 @@ def without_rdoc(&block) 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 74a7de38c..3bc00638d 100644 --- a/test/irb/test_debug_cmd.rb +++ b/test/irb/test_debug_cmd.rb @@ -9,7 +9,6 @@ require "tempfile" require "tmpdir" -require_relative "../lib/envutil" require_relative "helper" module TestIRB