naruse	2012-07-24 18:57:59 +0900 (Tue, 24 Jul 2012)

  New Revision: 36521

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

  Log:
    Unix doesn't use win_expected_filename.
    
    r36519's essensial part is not to use filename.force_encoding("euc-jp").

  Modified files:
    trunk/test/ruby/test_dir_m17n.rb

Index: test/ruby/test_dir_m17n.rb
===================================================================
--- test/ruby/test_dir_m17n.rb	(revision 36520)
+++ test/ruby/test_dir_m17n.rb	(revision 36521)
@@ -196,9 +196,7 @@
       EOS
       assert_ruby_status(%w[-EASCII-8BIT], <<-'EOS', nil, :chdir=>d)
         filename = "\xA4\xA2".force_encoding('ASCII-8BIT')
-        win_expected_filename =
-          [Encoding::US_ASCII, Encoding::ASCII_8BIT].include?(Encoding.find("filesystem")) \
-          ? filename : filename.encode(Encoding.find("filesystem"), "euc-jp") 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)
         result = ents.include?(filename) ||

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