usa	2012-12-13 14:11:02 +0900 (Thu, 13 Dec 2012)

  New Revision: 38356

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38356

  Log:
    * test/ruby/test_require.rb (TestRequire#test_loaded_features_encoding):
      need to check compatibility, not equality of encodings.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_require.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38355)
+++ ChangeLog	(revision 38356)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Dec 13 14:10:13 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* file.c (rb_file_join): check encoding compatibility before joining
Index: test/ruby/test_require.rb
===================================================================
--- test/ruby/test_require.rb	(revision 38355)
+++ test/ruby/test_require.rb	(revision 38356)
@@ -429,7 +429,7 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_require.rb#L429
       $: << 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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/