diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 16:56:03 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-27 16:56:03 +0000 |
commit | e3a295cd5098b880f20ccf3a75e0218adcc34fbe (patch) | |
tree | 0c5357a437d2110aaa594d994cb16f94251f91eb | |
parent | 7f04247e6db5eaad447c8cc04332058fbd228973 (diff) |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/lib/test/unit/parallel.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/lib/test/unit/parallel.rb b/test/lib/test/unit/parallel.rb index 1e12d18457..a0d6a45a51 100644 --- a/test/lib/test/unit/parallel.rb +++ b/test/lib/test/unit/parallel.rb @@ -152,8 +152,7 @@ module Test 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: @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.3" #define RUBY_RELEASE_DATE "2017-03-28" -#define RUBY_PATCHLEVEL 288 +#define RUBY_PATCHLEVEL 289 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 |