From 5ab4781caef13c351cdfe8d2697ae6f2e68d4a61 Mon Sep 17 00:00:00 2001 From: Hiroshi Shirosaki Date: Mon, 30 Jul 2012 22:59:36 +0900 Subject: [PATCH] Fix test_encoding failure on Windows With chcp 65001, 1252 and 437, test_encoding fails. Test result depends on locale because LANG environment variable doesn't affect locale on Windows. --- test/ruby/test_rubyoptions.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 1f2732c..87eb049 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -199,14 +199,21 @@ class TestRubyOptions < Test::Unit::TestCase end def test_encoding - assert_in_out_err(%w(-Eutf-8), "p '\u3042'", [], /invalid multibyte char/) - assert_in_out_err(%w(--encoding), "", [], /missing argument for --encoding/) assert_in_out_err(%w(--encoding test_ruby_test_rubyoptions_foobarbazqux), "", [], /unknown encoding name - test_ruby_test_rubyoptions_foobarbazqux \(RuntimeError\)/) - assert_in_out_err(%w(--encoding utf-8), "p '\u3042'", [], /invalid multibyte char/) + if /mswin|mingw/ =~ RUBY_PLATFORM && + (str = "\u3042".force_encoding(Encoding.find("locale"))).valid_encoding? + # This result depends on locale because LANG=C doesn't affect locale + # on Windows. + out, err = [str], [] + else + out, err = [], /invalid multibyte char/ + end + assert_in_out_err(%w(-Eutf-8), "puts '\u3042'", out, err) + assert_in_out_err(%w(--encoding utf-8), "puts '\u3042'", out, err) end def test_syntax_check -- 1.7.11.msysgit.1