usa	2012-11-08 15:24:15 +0900 (Thu, 08 Nov 2012)

  New Revision: 37557

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

  Log:
    merge revision(s) 36515,36521:
    
    * test/ruby/test_dir_m17n.rb: sorry, typo.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_dir_m17n.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37556)
+++ ruby_1_9_3/ChangeLog	(revision 37557)
@@ -1,3 +1,7 @@
+Thu Nov  8 15:22:09 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/ruby/test_dir_m17n.rb: sorry, typo.
+
 Thu Nov  8 14:50:02 2012  Masaki Suketa <masaki.suketa@n...>
 
 	* test/win32ole/test_win32ole_variant.rb: setting WIN32OLE.locale
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37556)
+++ ruby_1_9_3/version.h	(revision 37557)
@@ -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
Index: ruby_1_9_3/test/ruby/test_dir_m17n.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_dir_m17n.rb	(revision 37556)
+++ ruby_1_9_3/test/ruby/test_dir_m17n.rb	(revision 37557)
@@ -196,12 +196,12 @@
       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)

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36515,36521


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