naruse	2012-02-15 05:03:06 +0900 (Wed, 15 Feb 2012)

  New Revision: 34601

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34601

  Log:
    merge revision(s) 32640: [Backport #6017]
    
    * test/win32ole/test_err_in_callback.rb (test_err_in_callback): 
      skip test if ADODB.connection is not available.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/win32ole/test_err_in_callback.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34600)
+++ ruby_1_9_3/ChangeLog	(revision 34601)
@@ -1,3 +1,8 @@
+Wed Feb 15 05:02:43 2012  Masaki Suketa <masaki.suketa@n...>
+
+	* test/win32ole/test_err_in_callback.rb (test_err_in_callback): 
+	  skip test if ADODB.connection is not available.
+
 Wed Feb 15 04:49:23 2012  Yusuke Endoh  <mame@t...>
 
 	* parse.y (debug_lines, coverage): set file path encoding for coverage
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34600)
+++ ruby_1_9_3/version.h	(revision 34601)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 111
+#define RUBY_PATCHLEVEL 112
 
 #define RUBY_RELEASE_DATE "2012-02-15"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/win32ole/test_err_in_callback.rb
===================================================================
--- ruby_1_9_3/test/win32ole/test_err_in_callback.rb	(revision 34600)
+++ ruby_1_9_3/test/win32ole/test_err_in_callback.rb	(revision 34601)
@@ -23,7 +23,17 @@
       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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/