1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* test/win32ole/test_word.rb: use skip method to skip test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2015-02-10 22:54:39 +00:00
parent 193ad64359
commit 11ac08676d
2 changed files with 10 additions and 10 deletions

View file

@ -1,3 +1,7 @@
Wed Feb 11 07:53:35 2015 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* test/win32ole/test_word.rb: use skip method to skip test.
Tue Feb 10 11:38:28 2015 Shugo Maeda <shugo@ruby-lang.org> Tue Feb 10 11:38:28 2015 Shugo Maeda <shugo@ruby-lang.org>
* vm_insnhelper.c (vm_call_method): stop method search when a method * vm_insnhelper.c (vm_call_method): stop method search when a method

View file

@ -26,20 +26,17 @@ def word_installed?
end end
if defined?(WIN32OLE) if defined?(WIN32OLE)
dotest = word_installed? class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
if !dotest unless word_installed?
STDERR.puts("\n#{__FILE__} skipped(Microsoft Word not found.)") def test_dummy_for_skip_message
end skip "Microsoft Word is not installed"
if dotest end
class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase else
def setup def setup
begin begin
@obj = WIN32OLE.new('Word.Application') @obj = WIN32OLE.new('Word.Application')
rescue WIN32OLERuntimeError rescue WIN32OLERuntimeError
@obj = nil @obj = nil
if !$skipped
$skipped = true
end
end end
end end
@ -48,7 +45,6 @@ if defined?(WIN32OLE)
@obj.visible = true @obj.visible = true
@obj.wordbasic.disableAutoMacros(true) @obj.wordbasic.disableAutoMacros(true)
assert(true) assert(true)
else
end end
end end