From 890200e85e5237d9656a6b72e792effbcaa5460a Mon Sep 17 00:00:00 2001 From: aycabta Date: Tue, 3 Dec 2019 12:54:24 +0900 Subject: [PATCH] Check DONT_RUN_RELINE_TEST envvar --- test/readline/helper.rb | 18 ++++++++++-------- test/readline/test_readline.rb | 2 +- test/readline/test_readline_history.rb | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/test/readline/helper.rb b/test/readline/helper.rb index ee157722f13951..d5f02573ec76a3 100644 --- a/test/readline/helper.rb +++ b/test/readline/helper.rb @@ -3,18 +3,20 @@ ReadlineSo = Readline rescue LoadError end -require "reline" def use_ext_readline # Use ext/readline as Readline Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline) Object.const_set(:Readline, ReadlineSo) end -def use_lib_reline # Use lib/reline as Readline - Reline.send(:remove_const, 'IOGate') if Reline.const_defined?('IOGate') - Reline.const_set('IOGate', Reline::GeneralIO) - Reline.send(:core).config.instance_variable_set(:@test_mode, true) - Reline.send(:core).config.reset - Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline) - Object.const_set(:Readline, Reline) +unless ENV['DONT_RUN_RELINE_TEST'] + require "reline" + def use_lib_reline # Use lib/reline as Readline + Reline.send(:remove_const, 'IOGate') if Reline.const_defined?('IOGate') + Reline.const_set('IOGate', Reline::GeneralIO) + Reline.send(:core).config.instance_variable_set(:@test_mode, true) + Reline.send(:core).config.reset + Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline) + Object.const_set(:Readline, Reline) + end end diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 45197724ea531f..d2e2cdd4a00f41 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -799,4 +799,4 @@ def get_default_internal_encoding super end end -end +end if defined?(Reline) diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb index 509f1d687efc25..98fef655e10e18 100644 --- a/test/readline/test_readline_history.rb +++ b/test/readline/test_readline_history.rb @@ -283,4 +283,4 @@ def get_default_internal_encoding super end end -end +end if defined?(Reline)