From e845e35fa31766f347abdb86bf69793d584537fc Mon Sep 17 00:00:00 2001
From: suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 23 Jul 2011 10:13:53 +0000
Subject: [PATCH] * test/win32ole/test_err_in_callback.rb
 (test_err_in_callback):   skip test if ADODB.connection is not available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                             |  5 +++++
 test/win32ole/test_err_in_callback.rb | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b09a912dfc..4c8bfa1e4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 23 19:12:53 2011  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_err_in_callback.rb (test_err_in_callback): 
+	  skip test if ADODB.connection is not available.
+
 Sat Jul 23 15:37:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* parse.y (rb_enc_symname_type): :$a!, @a! and so on are not
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
index 4fc97c27a1..11c29a8d77 100644
--- a/test/win32ole/test_err_in_callback.rb
+++ b/test/win32ole/test_err_in_callback.rb
@@ -23,7 +23,17 @@ if defined?(WIN32OLE)
       end
     end
 
+    def available_adodb?
+      begin
+        db = WIN32OLE.new('ADODB.Connection')
+      rescue WIN32OLERuntimeError
+        return false
+      end
+      return true
+    end
+
     def test_err_in_callback
+      skip "'ADODB.Connection' is not available" unless available_adodb?
       if @ruby
         cmd = "#{@ruby} -v #{@iopt} #{@script} > test_err_in_callback.log 2>&1"
         system(cmd)