diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-20 09:06:35 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-20 09:06:35 +0000 |
| commit | 0ddc8305736610337d6c26b3cec2c767cc5a054c (patch) | |
| tree | e3a9880f73be06acc8e852899f6caa3ac8575c5f /test | |
| parent | 7340277cfb06305590a62a505c49e63a491be20c (diff) | |
merges r23557 and r23563 from trunk into ruby_1_9_1.
--
* thread.c (rb_exec_recursive_paired): new function for proper
handling of recursive arrays. [EXPERIMENTAL] [ruby-core:23402]
* array.c (rb_ary_equal, rb_ary_eql, rb_ary_cmp): use above.
* hash.c (hash_equal): ditto.
--
* test/ruby/test_hash.rb (TestHash::test_equal2): recursive hashes
are handled properly now. ref: [ruby-core:23402]
* test/ruby/test_m17n.rb (TestM17N#test_sprintf_p): test fixed
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_hash.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_m17n.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 5a17ac4fb5..3f59443849 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -770,7 +770,9 @@ class TestHash < Test::Unit::TestCase h1 = {}; h1[h1] = h1; h1.rehash h2 = {}; h2[h2] = h2; h2.rehash - assert(h1 != h2) + # assert(h1 != h2) + # recursive hashes are handled properly now. [ruby-core:23402] + assert(h1 == h2) end def test_eql diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index e327ead045..afea18eabb 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -770,7 +770,7 @@ class TestM17N < Test::Unit::TestCase #assert_strenc("\"\xC2\xA1\"", 'Windows-31J', s("%p") % s("\xc2\xa1")) assert_strenc("\"\xC2\xA1\"", 'UTF-8', u("%p") % u("\xc2\xa1")) - assert_strenc('"\xC2\xA1"', 'US-ASCII', "%10p" % a("\xc2\xa1")) + assert_strenc('"\xC2\xA1"', 'ASCII-8BIT', "%10p" % a("\xc2\xa1")) assert_strenc(" \"\xC2\xA1\"", 'EUC-JP', "%10p" % e("\xc2\xa1")) #assert_strenc(" \"\xC2\xA1\"", 'Windows-31J', "%10p" % s("\xc2\xa1")) assert_strenc(" \"\xC2\xA1\"", 'UTF-8', "%10p" % u("\xc2\xa1")) |