diff --git a/ChangeLog b/ChangeLog index deb65d7262..12cc173fef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Sep 29 19:40:32 2012 Hiroshi Shirosaki + + * test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic): + set script encoding to work with LANG=C. It would work on both + Windows and Unix. Refix of r37051. + Sat Sep 29 11:21:06 2012 Shugo Maeda * vm_insnhelper.c (rb_vm_using_modules): use using_modules before diff --git a/test/ruby/test_unicode_escape.rb b/test/ruby/test_unicode_escape.rb index af09428421..c1b1e2ca40 100644 --- a/test/ruby/test_unicode_escape.rb +++ b/test/ruby/test_unicode_escape.rb @@ -48,11 +48,8 @@ EOS # \u in %x strings assert_match(/^("?)A\1$/, `echo "\u0041"`) #" assert_match(/^("?)A\1$/, %x{echo "\u0041"}) #" - if /mswin|mingw/ =~ RUBY_PLATFORM - assert_match(/^("?)ü\1$/, `#{EnvUtil.rubybin} -e "puts \\"\u{FC}\\""`.force_encoding("utf-8")) #" - else - assert_match(/^("?)ü\1$/, `echo "\u{FC}"`.force_encoding("utf-8")) #" - end + assert_match(/^("?)ü\1$/, + `#{EnvUtil.rubybin} -e "#coding:utf-8\nputs \\"\u{FC}\\""`.force_encoding("utf-8")) #" # \u in quoted symbols assert_equal(:A, :"\u0041")