mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
7f04247e6d
commit
e3a295cd50
2 changed files with 2 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue