summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraycabta <aycabta@gmail.com>2019-12-03 12:36:01 +0900
committeraycabta <aycabta@gmail.com>2020-01-23 13:31:19 +0900
commita737f0cea5dd3a26389c0042d312ff7252de88bb (patch)
treee4952338711f1a4e477efe096ae6d0e2c86a9995
parent425b2064d394639101854c83a061a0918b33b857 (diff)
Stop using minitest dependent methods
-rw-r--r--test/readline/test_readline.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index a4b7cb4cc7..debac82f8c 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -434,8 +434,8 @@ module BasetestReadline
def test_input_metachar
skip "Skip Editline" if /EditLine/n.match(Readline::VERSION)
# test will pass on Windows reline, but not readline
- skip "Won't pass on mingw readline.so using 8.0.001" if mingw? and defined?(TestReadline) and kind_of?(TestReadline)
- skip 'Needs GNU Readline 6 or later' if windows? and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0'
+ skip "Won't pass on mingw readline.so using 8.0.001" if /mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline)
+ skip 'Needs GNU Readline 6 or later' if /mswin|mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0'
bug6601 = '[ruby-core:45682]'
Readline::HISTORY << "hello"
wo = nil
@@ -684,7 +684,7 @@ module BasetestReadline
# http://rubyci.s3.amazonaws.com/solaris11s-sunc/ruby-trunk/log/20181228T102505Z.fail.html.gz
skip 'This test does not succeed on Oracle Developer Studio for now'
end
- skip 'Needs GNU Readline 6 or later' if windows? and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0'
+ skip 'Needs GNU Readline 6 or later' if /mswin|mingw/ =~ RUBY_PLATFORM and defined?(TestReadline) and kind_of?(TestReadline) and Readline::VERSION < '6.0'
Readline.completion_proc = -> (_) { [] }
Readline.completer_quote_characters = "'\""
@@ -731,7 +731,7 @@ module BasetestReadline
Tempfile.create("test_readline_stdin") {|stdin|
Tempfile.create("test_readline_stdout") {|stdout|
yield stdin, stdout
- if windows?
+ if /mswin|mingw/ =~ RUBY_PLATFORM
# needed since readline holds refs to tempfiles, can't delete on Windows
Readline.input = STDIN
Readline.output = STDOUT