naruse	2017-03-13 00:02:30 +0900 (Mon, 13 Mar 2017)

  New Revision: 57914

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57914

  Log:
    merge revision(s) 57589: [Backport #13205]
    
    parallel.rb: fix intervention
    
    * test/lib/test/unit/parallel.rb (_report): send a response and a
      newline atomically, to get rid of intervention with "p" which
      runs in a separate thread.

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/test/lib/test/unit/parallel.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57913)
+++ ruby_2_4/version.h	(revision 57914)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 70
+#define RUBY_PATCHLEVEL 71
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/test/lib/test/unit/parallel.rb
===================================================================
--- ruby_2_4/test/lib/test/unit/parallel.rb	(revision 57913)
+++ ruby_2_4/test/lib/test/unit/parallel.rb	(revision 57914)
@@ -152,8 +152,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/lib/test/unit/parallel.rb#L152
       end
 
       def _report(res, *args) # :nodoc:
-        res = "#{res} #{args.pack("m0")}" unless args.empty?
-        @stdout.puts(res)
+        @stdout.write(args.empty? ? "#{res}\n" : "#{res} #{args.pack("m0")}\n")
       end
 
       def puke(klass, meth, e) # :nodoc:

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57589


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