diff options
| author | luislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-23 23:10:03 +0000 |
|---|---|---|
| committer | luislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-23 23:10:03 +0000 |
| commit | fa608f4af2468b97deef422c7c913c481968008a (patch) | |
| tree | 23a274ae96d99dad75e863c1e2ec1f7d324c6bea | |
| parent | 0d8bc52593328d3f9adaa67c79fdcff723534685 (diff) | |
| download | ruby-fa608f4af2468b97deef422c7c913c481968008a.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/win32ole/test_win32ole_method.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Jul 24 08:09:30 2012 Luis Lavena <luislavena@gmail.com> + + * 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 <drbrain@segment7.net> * 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 |