kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 57589: [Backport #13205]

Browse source 
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_2@58095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-03-25 16:13:11 +00:00
parent a48d15477e
commit 2d5eca7f50
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/lib/test/unit/parallel.rb
View file

@ -151,8 +151,7 @@ module Test
end end
def _report(res, *args) # :nodoc: def _report(res, *args) # :nodoc:
res = "#{res} #{args.pack("m0")}" unless args.empty? @stdout.write(args.empty? ? "#{res}\n" : "#{res} #{args.pack("m0")}\n")
@stdout.puts(res)
end end
def puke(klass, meth, e) # :nodoc: def puke(klass, meth, e) # :nodoc:

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26" #define RUBY_RELEASE_DATE "2017-03-26"
#define RUBY_PATCHLEVEL 427 #define RUBY_PATCHLEVEL 428
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3