From fa608f4af2468b97deef422c7c913c481968008a Mon Sep 17 00:00:00 2001 From: luislavena Date: Mon, 23 Jul 2012 23:10:03 +0000 Subject: [PATCH] Fix win32ole test failure under mingw-w64 (x64-mingw32) * test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki. [ruby-core:46651][Bug #6782] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/win32ole/test_win32ole_method.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4ae1e1d129..9f92722194 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 24 08:09:30 2012 Luis Lavena + + * test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform + used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki. + [ruby-core:46651][Bug #6782] + Tue Jul 24 07:22:58 2012 Eric Hodel * time.c (time_sec): Updated description of leap seconds for accuracy. diff --git a/test/win32ole/test_win32ole_method.rb b/test/win32ole/test_win32ole_method.rb index e4f38eac61..2c24004682 100644 --- a/test/win32ole/test_win32ole_method.rb +++ b/test/win32ole/test_win32ole_method.rb @@ -109,7 +109,7 @@ if defined?(WIN32OLE_METHOD) end def is_ruby64? - /mswin64|mingw64/ =~ RUBY_PLATFORM + /mswin64|x64-mingw/ =~ RUBY_PLATFORM end def test_offset_vtbl