summaryrefslogtreecommitdiff
path: root/test/win32ole
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-25 01:03:52 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-25 01:03:52 +0000
commit69a248a0736aba6e540670aff0cace024533cd68 (patch)
tree787125247f1f195e7bb4a2f2cab7ab4f3e870364 /test/win32ole
parented637d01d7f3769ab96546f437fa8bda81f93eb3 (diff)
* test/win32ole/test_err_in_callback.rb (teardown): remove tmp file
only when it exists. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/win32ole')
-rw-r--r--test/win32ole/test_err_in_callback.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
index bbbab719d6..4fc97c27a1 100644
--- a/test/win32ole/test_err_in_callback.rb
+++ b/test/win32ole/test_err_in_callback.rb
@@ -7,7 +7,6 @@ begin
require 'win32ole'
rescue LoadError
end
-require 'rbconfig'
if defined?(WIN32OLE)
require 'mkmf'
require 'test/unit'
@@ -20,7 +19,7 @@ if defined?(WIN32OLE)
@iopt = $:.map {|e|
" -I " + e
}.join("")
- @script = File.dirname(__FILE__) + "/err_in_callback.rb"
+ @script = File.join(File.dirname(__FILE__), "err_in_callback.rb")
end
end
@@ -37,8 +36,7 @@ if defined?(WIN32OLE)
end
def teardown
- File.unlink("test_err_in_callback.log")
+ File.unlink("test_err_in_callback.log") if File.exist?("test_err_in_callback.log")
end
-
end
end