archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 32640: [Backport #6017]

Browse source 
* 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
This commit is contained in:
naruse 2012-02-14 20:03:06 +00:00
parent 5f06da63d6
commit dbda1e9ea7
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Feb 15 05:02:43 2012 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.
Wed Feb 15 04:49:23 2012 Yusuke Endoh <mame@tsg.ne.jp>
* parse.y (debug_lines, coverage): set file path encoding for coverage

10
test/win32ole/test_err_in_callback.rb
View file

@ -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)

2
version.h
View file

@ -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