aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/win32ole/test_err_in_callback.rb6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 217b682828..39d71c379c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 25 10:03:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/win32ole/test_err_in_callback.rb (teardown): remove tmp file
+ only when it exists.
+
Thu Nov 25 01:38:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
* enc/trans/big5-hkscs-tbl.rb: Update table as HKSCS-2008.
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