yugui	2011-01-16 15:30:18 +0900 (Sun, 16 Jan 2011)

  New Revision: 30556

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

  Log:
    merges r30351 from trunk into ruby_1_9_2.
    --
    * test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
      suite writing to the source directory.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/csv/test_encodings.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30555)
+++ ruby_1_9_2/ChangeLog	(revision 30556)
@@ -1,3 +1,8 @@
+Sat Dec 25 15:04:05 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
+	  suite writing to the source directory.
+
 Sat Dec 25 14:27:09 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_extract_encoding_option): accept Encoding object as
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30555)
+++ ruby_1_9_2/version.h	(revision 30556)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 138
+#define RUBY_PATCHLEVEL 139
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/csv/test_encodings.rb
===================================================================
--- ruby_1_9_2/test/csv/test_encodings.rb	(revision 30555)
+++ ruby_1_9_2/test/csv/test_encodings.rb	(revision 30556)
@@ -13,11 +13,14 @@
 
 class TestEncodings < Test::Unit::TestCase
   def setup
-    @temp_csv_path = File.join(File.dirname(__FILE__), "temp.csv")
+    require 'tempfile'
+    @temp_csv_file = Tempfile.new(%w"test_csv. .csv")
+    @temp_csv_path = @temp_csv_file.path
+    @temp_csv_file.close
   end
 
   def teardown
-    File.unlink(@temp_csv_path) if File.exist? @temp_csv_path
+    @temp_csv_file.close!
   end
 
   ########################################

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