[前][次][番号順一覧][スレッド一覧]

ruby-changes:59778

From: aycabta <ko1@a...>
Date: Thu, 23 Jan 2020 13:37:48 +0900 (JST)
Subject: [ruby-changes:59778] a737f0cea5 (master): Stop using minitest dependent methods

https://git.ruby-lang.org/ruby.git/commit/?id=a737f0cea5

From a737f0cea5dd3a26389c0042d312ff7252de88bb Mon Sep 17 00:00:00 2001
From: aycabta <aycabta@g...>
Date: Tue, 3 Dec 2019 12:36:01 +0900
Subject: Stop using minitest dependent methods


diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index a4b7cb4..debac82 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -434,8 +434,8 @@ module BasetestReadline https://github.com/ruby/ruby/blob/trunk/test/readline/test_readline.rb#L434
   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 https://github.com/ruby/ruby/blob/trunk/test/readline/test_readline.rb#L684
       # 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 https://github.com/ruby/ruby/blob/trunk/test/readline/test_readline.rb#L731
     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
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]