summaryrefslogtreecommitdiff
path: root/test/ruby
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-05 20:40:54 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-05 20:40:54 +0000
commita410ff68c247350679b55a69af4ba0a5ea767244 (patch)
treeb80abfac7cea1f1258d80548898c7a26c23a00ff /test/ruby
parenta697c8b61b74744a63f2e896b36207fadf52f766 (diff)
merge revision(s) 61625,61626,61627:
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
Diffstat (limited to 'test/ruby')
-rw-r--r--test/ruby/test_optimization.rb2
-rw-r--r--test/ruby/test_proc.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index 11cf1ffbfb..5e17ea9032 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -689,7 +689,7 @@ class TestRubyOptimization < Test::Unit::TestCase
end
def test_clear_unreachable_keyword_args
- assert_separately [], <<-END
+ assert_separately [], <<-END, timeout: 15
script = <<-EOS
if true
else
diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index 68455c1bcc..e6618745f1 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -1325,7 +1325,7 @@ class TestProc < Test::Unit::TestCase
end
def test_local_variable_set_wb
- assert_ruby_status([], <<-'end;', '[Bug #13605]')
+ assert_ruby_status([], <<-'end;', '[Bug #13605]', timeout: 15)
b = binding
n = 20_000