diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | test/ruby/test_dir_m17n.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Thu Nov 8 15:22:09 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/ruby/test_dir_m17n.rb: sorry, typo. + Thu Nov 8 14:50:02 2012 Masaki Suketa <masaki.suketa@nifty.ne.jp> * test/win32ole/test_win32ole_variant.rb: setting WIN32OLE.locale diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index d9ff711435..fea7566249 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -196,12 +196,12 @@ class TestDir_M17N < Test::Unit::TestCase EOS assert_ruby_status(%w[-EASCII-8BIT], <<-'EOS', nil, :chdir=>d) filename = "\xA4\xA2".force_encoding('ASCII-8BIT') - win_expected_filename = filename.encode(Encoding.find("filesystem")) rescue "?" + win_expected_filename = filename.encode(Encoding.find("filesystem"), "euc-jp") rescue "?" opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM ents = Dir.entries(".", opts) p ents result = ents.include?(filename) || - (/darwin/ =~ RUBY_PLATFORM =~ /darwin/ && ents.include?("%A4%A2".force_encoding("ASCII-8BIT"))) || + (/darwin/ =~ RUBY_PLATFORM && ents.include?("%A4%A2".force_encoding("ASCII-8BIT"))) || (/mswin|mingw/ =~ RUBY_PLATFORM && ents.include?(win_expected_filename.force_encoding("ASCII-8BIT"))) if !result && /mswin|mingw/ =~ RUBY_PLATFORM exit Dir.entries(".", {:encoding => Encoding.find("filesystem")}).include?(win_expected_filename) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 313 +#define RUBY_PATCHLEVEL 314 #define RUBY_RELEASE_DATE "2012-11-08" #define RUBY_RELEASE_YEAR 2012 |