From 2bd2ea829f360bdae74281230aa3377b0c81fa14 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 8 Feb 2012 22:31:55 +0000 Subject: [PATCH] merge revision(s) 34499: * test/pathname/test_pathname.rb: not read but binread. patched by Benoit Daloze, [ruby-core:42440] [Bug #5984] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/pathname/test_pathname.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74f139e74d..ab140541b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 9 07:28:43 2012 NARUSE, Yui + + * test/pathname/test_pathname.rb: not read but binread. + patched by Benoit Daloze, [ruby-core:42440] [Bug #5984] + Wed Feb 8 22:29:59 2012 Nobuyoshi Nakada * string.c (rb_str_modify_expand): fix memory leak. diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index ac9b415022..8a8c0d9844 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -714,7 +714,7 @@ class TestPathname < Test::Unit::TestCase def test_binread with_tmpchdir('rubytest-pathname') {|dir| open("a", "w") {|f| f.write "abc" } - assert_equal("abc", Pathname("a").read) + assert_equal("abc", Pathname("a").binread) } end diff --git a/version.h b/version.h index 0a43fbcf47..0e486b8b5f 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 69 +#define RUBY_PATCHLEVEL 70 #define RUBY_RELEASE_DATE "2012-02-09" #define RUBY_RELEASE_YEAR 2012