archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 61625,61626,61627:

Browse source 
extend timeout to 15 seconds for ARMv8 environment

	Show how many seconds it timeouts

	By this we can easily extend timeout.

	Extend timeout of test_clear_unreachable_keyword_args

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@61630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-01-05 20:40:54 +00:00
parent a697c8b61b
commit a410ff68c2
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/lib/envutil.rb
View file

@ -147,7 +147,7 @@ module EnvUtil
stderr = stderr_filter.call(stderr) if stderr_filter stderr = stderr_filter.call(stderr) if stderr_filter
if timeout_error if timeout_error
bt = caller_locations bt = caller_locations
msg = "execution of #{bt.shift.label} expired" msg = "execution of #{bt.shift.label} expired timeout (#{timeout} sec)"
msg = Test::Unit::Assertions::FailDesc[status, msg, [stdout, stderr].join("\n")].() msg = Test::Unit::Assertions::FailDesc[status, msg, [stdout, stderr].join("\n")].()
raise timeout_error, msg, bt.map(&:to_s) raise timeout_error, msg, bt.map(&:to_s)
end end

2
test/ruby/test_optimization.rb
View file

@ -689,7 +689,7 @@ class TestRubyOptimization < Test::Unit::TestCase
end end
def test_clear_unreachable_keyword_args def test_clear_unreachable_keyword_args
assert_separately [], <<-END assert_separately [], <<-END, timeout: 15
script = <<-EOS script = <<-EOS
if true if true
else else

2
test/ruby/test_proc.rb
View file

@ -1325,7 +1325,7 @@ class TestProc < Test::Unit::TestCase
end end
def test_local_variable_set_wb def test_local_variable_set_wb
assert_ruby_status([], <<-'end;', '[Bug #13605]') assert_ruby_status([], <<-'end;', '[Bug #13605]', timeout: 15)
b = binding b = binding
n = 20_000 n = 20_000

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.0" #define RUBY_VERSION "2.5.0"
#define RUBY_RELEASE_DATE "2018-01-06" #define RUBY_RELEASE_DATE "2018-01-06"
#define RUBY_PATCHLEVEL 8 #define RUBY_PATCHLEVEL 9
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1