diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-16 06:30:18 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-16 06:30:18 +0000 |
commit | 60ae3101a1368264fbac7d10914c5caeb51e1e15 (patch) | |
tree | 20f0e0e7b3715bde470bad71077e849e48fc13f6 | |
parent | 3143c6d3819e0bef9c5c4170f9f2e4f5d2adbbb0 (diff) |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/csv/test_encodings.rb | 7 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat Dec 25 15:04:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * io.c (rb_io_extract_encoding_option): accept Encoding object as diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb index 3dc80ccdb1..bea4c620bb 100644 --- a/test/csv/test_encodings.rb +++ b/test/csv/test_encodings.rb @@ -13,11 +13,14 @@ require "csv" 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 ######################################## @@ -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 |