From a410ff68c247350679b55a69af4ba0a5ea767244 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 5 Jan 2018 20:40:54 +0000
Subject: [PATCH] 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
---
 test/lib/envutil.rb            | 2 +-
 test/ruby/test_optimization.rb | 2 +-
 test/ruby/test_proc.rb         | 2 +-
 version.h                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/lib/envutil.rb b/test/lib/envutil.rb
index fce0e1b382..5d3bce99ec 100644
--- a/test/lib/envutil.rb
+++ b/test/lib/envutil.rb
@@ -147,7 +147,7 @@ module EnvUtil
       stderr = stderr_filter.call(stderr) if stderr_filter
       if timeout_error
         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")].()
         raise timeout_error, msg, bt.map(&:to_s)
       end
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
 
diff --git a/version.h b/version.h
index 6cbc4ba608..783c5c663b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.5.0"
 #define RUBY_RELEASE_DATE "2018-01-06"
-#define RUBY_PATCHLEVEL 8
+#define RUBY_PATCHLEVEL 9
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 1