[前][次][番号順一覧][スレッド一覧]

ruby-changes:17908

From: usa <ko1@a...>
Date: Thu, 25 Nov 2010 10:05:38 +0900 (JST)
Subject: [ruby-changes:17908] Ruby:r29924 (trunk): * test/win32ole/test_err_in_callback.rb (teardown): remove tmp file

usa	2010-11-25 10:03:52 +0900 (Thu, 25 Nov 2010)

  New Revision: 29924

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29924

  Log:
    * test/win32ole/test_err_in_callback.rb (teardown): remove tmp file
      only when it exists.

  Modified files:
    trunk/ChangeLog
    trunk/test/win32ole/test_err_in_callback.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29923)
+++ ChangeLog	(revision 29924)
@@ -1,3 +1,8 @@
+Thu Nov 25 10:03:14 2010  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* enc/trans/big5-hkscs-tbl.rb: Update table as HKSCS-2008.
Index: test/win32ole/test_err_in_callback.rb
===================================================================
--- test/win32ole/test_err_in_callback.rb	(revision 29923)
+++ test/win32ole/test_err_in_callback.rb	(revision 29924)
@@ -7,7 +7,6 @@
   require 'win32ole'
 rescue LoadError
 end
-require 'rbconfig'
 if defined?(WIN32OLE)
   require 'mkmf'
   require 'test/unit'
@@ -20,7 +19,7 @@
         @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 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]