From f2fc80cebeafdb0c8e354b31825f192c7d40825e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 25 Nov 2014 18:44:12 +0000
Subject: vm_method.c: preserve encodings

* vm_method.c (rb_method_entry_make): preserve encodings of
  constant names in warning messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_const.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'test/ruby')

diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb
index 8b3acfb683..417cc7c961 100644
--- a/test/ruby/test_const.rb
+++ b/test/ruby/test_const.rb
@@ -49,11 +49,15 @@ class TestConst < Test::Unit::TestCase
 
   def test_redefinition
     c = Class.new
-    c.const_set(:X, 1)
-    assert_output(nil, <<-WARNING) {c.const_set(:X, 2)}
-#{__FILE__}:#{__LINE__-1}: warning: already initialized constant #{c}::X
-#{__FILE__}:#{__LINE__-3}: warning: previous definition of X was here
+    name = "X\u{5b9a 6570}"
+    c.const_set(name, 1)
+    prev_line = __LINE__ - 1
+    EnvUtil.with_default_internal(Encoding::UTF_8) do
+      assert_output(nil, <<-WARNING) {c.const_set(name, 2)}
+#{__FILE__}:#{__LINE__-1}: warning: already initialized constant #{c}::#{name}
+#{__FILE__}:#{prev_line}: warning: previous definition of #{name} was here
 WARNING
+    end
     code = <<-PRE
 olderr = $stderr.dup
 $stderr.reopen(File::NULL, "wb")
-- 
cgit v1.2.3