mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
3432474c90
commit
bfb08c1ece
2 changed files with 6 additions and 1 deletions
|
@ -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>
|
Thu Dec 13 14:02:15 2012 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
* file.c (rb_file_join): check encoding compatibility before joining
|
* file.c (rb_file_join): check encoding compatibility before joining
|
||||||
|
|
|
@ -429,7 +429,7 @@ class TestRequire < Test::Unit::TestCase
|
||||||
$: << tmp
|
$: << tmp
|
||||||
open(File.join(tmp, "foo.rb"), "w") {}
|
open(File.join(tmp, "foo.rb"), "w") {}
|
||||||
require "foo"
|
require "foo"
|
||||||
assert_equal(tmp.encoding, $"[0].encoding, bug6377)
|
assert(Encoding.compatible?(tmp, $"[0]), bug6377)
|
||||||
}
|
}
|
||||||
ensure
|
ensure
|
||||||
$:.replace(loadpath)
|
$:.replace(loadpath)
|
||||||
|
|
Loading…
Reference in a new issue