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 + + * 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 * 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)