diff options
| -rw-r--r-- | test/ruby/test_dir_m17n.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index 9485ee8ba4..d3f68fe588 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -196,7 +196,9 @@ 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.force_encoding("euc-jp").encode(Encoding.find("filesystem")) rescue "?" + win_expected_filename = + [Encoding::US_ASCII, Encoding::ASCII_8BIT].include?(Encoding.find("filesystem")) \ + ? 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) || |