nagachika	2013-04-23 20:19:30 +0900 (Tue, 23 Apr 2013)

  New Revision: 40421

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

  Log:
    merge revision(s) 40182,40221: [Backport #8311]
    
    test_curses.rb: add sentinel
    
    * test/test_curses.rb (TestCurses#run_curses): add sentinel to get rid
      of read pty output after the child process terminated, which causes
      EIO on Linux.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/test_curses.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40420)
+++ ruby_2_0_0/version.h	(revision 40421)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-04-21"
-#define RUBY_PATCHLEVEL 158
+#define RUBY_RELEASE_DATE "2013-04-23"
+#define RUBY_PATCHLEVEL 159
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 23
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/test_curses.rb
===================================================================
--- ruby_2_0_0/test/test_curses.rb	(revision 40420)
+++ ruby_2_0_0/test/test_curses.rb	(revision 40421)
@@ -28,14 +28,17 @@ rescue Exception => e https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/test_curses.rb#L28
 ensure
   close_screen
   puts "", [Marshal.dump([result, e])].pack('m').delete("\n")
+  print "\\0"
+  $stdio.flush
 end
 src
       if input
         w.print(input)
         w.flush
       end
-      res = r.read
+      res = r.gets("\0")
       return unless res
+      res.chomp!("\0")
       res, error = Marshal.load(res[/(.*)\Z/, 1].unpack('m')[0])
       raise error if error
       return res

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40182,40221


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