From dbda1e9ea795d1340e3818b1309c90132818eff5 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 14 Feb 2012 20:03:06 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/win32ole/test_err_in_callback.rb | 10 ++++++++++ version.h | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b6f678fa74..b31b24bc42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 15 05:02:43 2012 Masaki Suketa + + * 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 * parse.y (debug_lines, coverage): set file path encoding for coverage 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) diff --git a/version.h b/version.h index ddcbcb122b..924ebaf9ee 100644 --- a/version.h +++ b/version.h @@ -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