summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-04 13:37:26 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-04 13:37:26 +0000
commit0dc0021407fa160f16c1cb40a585bbf019ea8f74 (patch)
tree4c9894394d1828ffc9de3f5fbd94259c0f437d2c
parentde09046e38faef6876e3e9c451aedb771e4af07c (diff)
downloadruby-0dc0021407fa160f16c1cb40a585bbf019ea8f74.tar.gz
ruby-0dc0021407fa160f16c1cb40a585bbf019ea8f74.tar.xz
ruby-0dc0021407fa160f16c1cb40a585bbf019ea8f74.zip
merges r20104 from trunk into ruby_1_9_1.
* test/zlib/test_zlib.rb(test_readchar): compare in same type. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/zlib/test_zlib.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e54155261..04157b241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 4 08:00:00 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
+
+ * test/zlib/test_zlib.rb(test_readchar): compare in same type.
+
Tue Nov 4 03:28:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_join): do not repeat self in a recursive array.
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index 5746f036e..9e4cf8003 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -490,7 +490,7 @@ if defined? Zlib
Zlib::GzipWriter.open(t.path) {|gz| gz.print("foobar") }
f = Zlib::GzipReader.open(t.path)
- "foobar".each_byte {|c| assert_equal(c, f.readchar) }
+ "foobar".each_byte {|c| assert_equal(c, f.readchar.ord) }
assert_raise(EOFError) { f.readchar }
end