merge revision(s) 37862:

	* test/ruby/test_argf.rb (TestArgf#test_chars): since marshal data is
	  binary, shouldn't pass via text mode.  use base64 encoded data.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 72e5d369a4..f7fab3ca12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 21 16:03:54 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_argf.rb (TestArgf#test_chars): since marshal data is
+	  binary, shouldn't pass via text mode.  use base64 encoded data.
+
 Thu Dec 13 23:10:52  Charlie Somerville  <charlie@charliesomerville.com>
 	* object.c (Init_Object): use rb_mod_init_copy for Class#initialize_copy
 	* class.c (rb_class_init_copy): rename to class_init_copy_check, performs type
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index 46e762c09a..1f824152e0 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -767,9 +767,9 @@ class TestArgf < Test::Unit::TestCase
 
   def test_chars
     ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f|
-      print Marshal.dump(ARGF.chars.to_a)
+      print [Marshal.dump(ARGF.chars.to_a)].pack('m')
     SRC
-      assert_equal(["1", "\n", "2", "\n", "3", "\n", "4", "\n", "5", "\n", "6", "\n"], Marshal.load(f.read))
+    assert_equal(["1", "\n", "2", "\n", "3", "\n", "4", "\n", "5", "\n", "6", "\n"], Marshal.load(f.read.unpack('m').first))
     end
   end
 
diff --git a/version.h b/version.h
index b56264d9dc..bebdd72c16 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 355
+#define RUBY_PATCHLEVEL 356
 
-#define RUBY_RELEASE_DATE "2012-12-20"
+#define RUBY_RELEASE_DATE "2012-12-21"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"