From 2411cab586ead92c5bab86eb9f63c8bf335a76c3 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 23 Nov 2016 04:40:40 +0000
Subject: Don't encode to UTF-8 if it's unnecessary.

If the file system encoding is ISO-8851-1 or if the encoding of the target
string is invalid, don't encode to UTF-8.  [ruby-core:78271] [Bug#12972]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_dir_m17n.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'test/ruby')

diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb
index 754c035ccb..5d009aceb1 100644
--- a/test/ruby/test_dir_m17n.rb
+++ b/test/ruby/test_dir_m17n.rb
@@ -381,7 +381,9 @@ class TestDir_M17N < Test::Unit::TestCase
       bug12081 = '[ruby-core:73868] [Bug #12081]'
       a = "*".force_encoding("us-ascii")
       result = Dir[a].map {|n|
-        if n.encoding == Encoding::ASCII_8BIT
+        if n.encoding == Encoding::ASCII_8BIT ||
+            n.encoding == Encoding::ISO_8859_1 ||
+            !n.valid_encoding?
           n.force_encoding(Encoding::UTF_8)
         else
           n.encode(Encoding::UTF_8)
-- 
cgit v1.2.3