From bfb08c1ece75101e36caef2a87ca74a3e07e92d4 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 13 Dec 2012 05:11:02 +0000
Subject: [PATCH] * test/ruby/test_require.rb
 (TestRequire#test_loaded_features_encoding):   need to check compatibility,
 not equality of encodings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                 | 5 +++++
 test/ruby/test_require.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 548eaddfa4..0e10337e2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 13 14:10:13 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_require.rb (TestRequire#test_loaded_features_encoding):
+	  need to check compatibility, not equality of encodings.
+
 Thu Dec 13 14:02:15 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (rb_file_join): check encoding compatibility before joining
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index d3cae1e01c..bbfc6e619c 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -429,7 +429,7 @@ class TestRequire < Test::Unit::TestCase
       $: << tmp
       open(File.join(tmp, "foo.rb"), "w") {}
       require "foo"
-      assert_equal(tmp.encoding, $"[0].encoding, bug6377)
+      assert(Encoding.compatible?(tmp, $"[0]), bug6377)
     }
   ensure
     $:.replace(loadpath)