From ac454412abff3e4ba084c987802f61dcc4914dae Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 18 Mar 2013 05:47:37 +0000
Subject: * test/win32ole/test_err_in_callback.rb  
 (TestErrInCallBack#test_err_in_callback): shouldn't create a file in   source
 directory.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                             |  6 ++++++
 test/win32ole/test_err_in_callback.rb | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4fc55b69d..133db3fb5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 18 14:46:19 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole/test_err_in_callback.rb
+	  (TestErrInCallBack#test_err_in_callback): shouldn't create a file in
+	  source directory.
+
 Mon Mar 18 13:29:52 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* vm_dump.c (backtrace): on darwin use custom backtrace() to trace
diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
index 11c29a8d77..395173d82c 100644
--- a/test/win32ole/test_err_in_callback.rb
+++ b/test/win32ole/test_err_in_callback.rb
@@ -10,6 +10,7 @@ end
 if defined?(WIN32OLE)
   require 'mkmf'
   require 'test/unit'
+  require 'tmpdir'
   class TestErrInCallBack < Test::Unit::TestCase
     def setup
       @ruby = nil
@@ -35,18 +36,17 @@ if defined?(WIN32OLE)
     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)
-        str = ""
-        open("test_err_in_callback.log") {|ifs|
-          str = ifs.read
-        }
-        assert_match(/NameError/, str)
+        Dir.mktmpdir do |tmpdir|
+          logfile = File.join(tmpdir, "test_err_in_callback.log")
+          cmd = "#{@ruby} -v #{@iopt} #{@script} > #{logfile.gsub(%r(/), '\\')} 2>&1"
+          system(cmd)
+          str = ""
+          open(logfile) {|ifs|
+            str = ifs.read
+          }
+          assert_match(/NameError/, str)
+        end
       end
     end
-
-    def teardown
-      File.unlink("test_err_in_callback.log") if File.exist?("test_err_in_callback.log")
-    end
   end
 end
-- 
cgit v1.2.3