summaryrefslogtreecommitdiff
path: root/test/win32ole
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 16:32:32 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 16:32:32 +0000
commitfb06765feb2840a7204059a0109a4f4d0de49947 (patch)
treed5d1e20729ec02ac88c565dadde62cde1e2ff43c /test/win32ole
parentdb2c8f6eb88eddcd52527ae48fb0dcfc9820343e (diff)
merges r20089, r20090 and r20091 from trunk into ruby_1_9_1.
* ext/win32ole/win32ole.c (ole_event_free): invoke IConnectionPoint::Unadvise before invoking IConnectionPoint::Release. * test/win32ole/test_win32ole_event.rb, test/win32ole/err_in_callback.rb, test/win32ole/test_err_in_callback.rb: Use ActiveX Data Object Library instead of InternetExplorer. -- * test/win32ole/test_err_in_callback.rb: add teardown. -- * test/win32ole/test_win32ole_event.rb: rename test class. * test/win32ole/test_win32ole_variant_outarg.rb: add in order to use ADO instead of Internet Explorer. remove test/win32ole/test_win32ole_variant_with_ie.rb. * test/win32ole/orig_data.csv: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/win32ole')
-rw-r--r--test/win32ole/test_err_in_callback.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
index bbbab719d6..f067c82e4b 100644
--- a/test/win32ole/test_err_in_callback.rb
+++ b/test/win32ole/test_err_in_callback.rb
@@ -39,6 +39,5 @@ if defined?(WIN32OLE)
def teardown
File.unlink("test_err_in_callback.log")
end
-
end
end