diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-23 18:23:07 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-23 18:23:07 +0000 |
commit | 7b70f0e22ac6a5edce3db3ffe199d61bc8e098bc (patch) | |
tree | 860ead0e95c5ccac2fea7ef9107a1b99a7de58e0 /test | |
parent | ab3376b99289c50d7dee06f4dcb86e6a0e608b55 (diff) |
merge revision(s) 54720: [Backport #12184]
* ruby.c: cygwin does not use w32_cmdvector, command line can be
other than UTF-8. [ruby-dev:49519] [Bug #12184]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_rubyoptions.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 72672292b7..bb822eabcd 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -681,7 +681,8 @@ class TestRubyOptions < Test::Unit::TestCase end end - if /mswin|mingw/ =~ RUBY_PLATFORM + case RUBY_PLATFORM + when /mswin|mingw/ def test_command_line_glob_nonascii bug10555 = '[ruby-dev:48752] [Bug #10555]' name = "\u{3042}.txt" @@ -718,9 +719,7 @@ class TestRubyOptions < Test::Unit::TestCase assert_in_out_err(["-e", "", "test/*"], "", [], [], bug10941) end end - end - if /mswin|mingw/ =~ RUBY_PLATFORM Ougai = %W[\u{68ee}O\u{5916}.txt \u{68ee 9d0e 5916}.txt \u{68ee 9dd7 5916}.txt] def test_command_line_glob_noncodepage with_tmpchdir do |dir| @@ -730,6 +729,14 @@ class TestRubyOptions < Test::Unit::TestCase assert_in_out_err(["-e", "puts ARGV", "*.txt"], "", ougai) end end + when /cygwin/ + def test_command_line_non_ascii + assert_separately([{"LC_ALL"=>"ja_JP.SJIS"}, "-", "\u{3042}".encode("SJIS")], <<-"end;") + bug12184 = '[ruby-dev:49519] [Bug #12184]' + a = ARGV[0] + assert_equal([Encoding::SJIS, 130, 160], [a.encoding, *a.bytes], bug12184) + end; + end end def test_script_is_directory |