summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-24 01:39:14 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-24 01:39:14 +0000
commit5841efa380f9fe76b09588fbbc09d17acb0f24ed (patch)
tree8591ff06632ad94105a26c4f248cca8d0aa20ca5 /test
parente518f1dd32c4e72f981a85dd0f0f5168e97541ba (diff)
merge revision(s) 36508: [Backport #7015]
* 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/branches/ruby_1_9_3@37022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/win32ole/test_win32ole_method.rb2
1 files changed, 1 insertions, 1 deletions
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