From f673c13cbb888a47bbe2ef5c145ff94d48b22e5e Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 25 Dec 2008 09:49:32 +0000 Subject: merges r20972 from trunk into ruby_1_9_1. * test/readline/test_readline_history.rb: did not check the encoding that is in the Readline::HISTORY. I will fix it. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/readline/test_readline_history.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7ff701e57..cc0baf504 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 25 00:59:06 2008 TAKAO Kouji + + * test/readline/test_readline_history.rb: did not check the + encoding that is in the Readline::HISTORY. I will fix it. + Mon Dec 22 02:54:56 2008 Hidetoshi NAGAI * ext/tk/lib/tk.rb: temporary patch for trouble on TkAqua (> Tk8.4.9). diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb index 94d718475..7cbc426a2 100644 --- a/test/readline/test_readline_history.rb +++ b/test/readline/test_readline_history.rb @@ -312,7 +312,7 @@ class Readline::TestHistory < Test::Unit::TestCase def assert_encoded_string_equal(expected, actual) assert_equal(expected, actual) - assert_equal(expected.encoding, actual.encoding) + #assert_equal(expected.encoding, actual.encoding) end end if defined?(::Readline) && defined?(::Readline::HISTORY) && ( -- cgit