usa	2012-12-21 16:04:07 +0900 (Fri, 21 Dec 2012)

  New Revision: 38516

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38516

  Log:
    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.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_argf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38515)
+++ ruby_1_9_3/ChangeLog	(revision 38516)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Dec 21 16:03:54 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@c...>
 	* 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
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38515)
+++ ruby_1_9_3/version.h	(revision 38516)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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"
 
Index: ruby_1_9_3/test/ruby/test_argf.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_argf.rb	(revision 38515)
+++ ruby_1_9_3/test/ruby/test_argf.rb	(revision 38516)
@@ -767,9 +767,9 @@ class TestArgf < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/ruby/test_argf.rb#L767
 
   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
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r37862


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/