ruby-changes:53187
From: k0kubun <ko1@a...>
Date: Sun, 28 Oct 2018 10:19:35 +0900 (JST)
Subject: [ruby-changes:53187] k0kubun:r65402 (trunk): revert r65401
k0kubun 2018-10-28 10:19:30 +0900 (Sun, 28 Oct 2018) New Revision: 65402 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65402 Log: revert r65401 Because it does break Linux CI like: https://gist.github.com/ko1/2c561f9185492f339cf7a763ea219e79 Modified files: trunk/spec/ruby/library/win32ole/fixtures/classes.rb Index: spec/ruby/library/win32ole/fixtures/classes.rb =================================================================== --- spec/ruby/library/win32ole/fixtures/classes.rb (revision 65401) +++ spec/ruby/library/win32ole/fixtures/classes.rb (revision 65402) @@ -1,7 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/spec/ruby/library/win32ole/fixtures/classes.rb#L1 -require 'win32ole' +begin + require 'win32ole' +rescue LoadError +end module WIN32OLESpecs - MSXML_AVAILABLE = !!WIN32OLE_TYPELIB.typelibs.find { |t| t.name.start_with?('Microsoft XML') } + begin + MSXML_AVAILABLE = !!WIN32OLE_TYPELIB.typelibs.find { |t| t.name.start_with?('Microsoft XML') } + rescue + MSXML_AVAILABLE = false + end def self.new_ole(name) tries = 0 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/