1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* test/ruby/test_dir_m17n.rb: remove a garbage.

* test/ruby/test_dir_m17n.rb: convert from ascii-8bit to other encoding
  with 8bit bytes always fails.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-07-24 03:36:29 +00:00
parent 989a6cb176
commit 2b4f1eed4c
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,10 @@
Tue Jul 24 12:35:13 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_dir_m17n.rb: remove a garbage.
* test/ruby/test_dir_m17n.rb: convert from ascii-8bit to other encoding
with 8bit bytes always fails.
Tue Jul 24 12:32:18 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_dir_m17n.rb: sorry, typo.

View file

@ -196,10 +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.encode(Encoding.find("filesystem")) rescue "?"
win_expected_filename = filename.force_encoding("euc-jp").encode(Encoding.find("filesystem")) rescue "?"
opts = {:encoding => Encoding.default_external} if /mswin|mingw/ =~ RUBY_PLATFORM
ents = Dir.entries(".", opts)
p ents
result = ents.include?(filename) ||
(/darwin/ =~ RUBY_PLATFORM && ents.include?("%A4%A2".force_encoding("ASCII-8BIT"))) ||
(/mswin|mingw/ =~ RUBY_PLATFORM && ents.include?(win_expected_filename.force_encoding("ASCII-8BIT")))