naruse	2018-01-06 05:40:54 +0900 (Sat, 06 Jan 2018)

  New Revision: 61630

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61630

  Log:
    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

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/test/lib/envutil.rb
    branches/ruby_2_5/test/ruby/test_optimization.rb
    branches/ruby_2_5/test/ruby/test_proc.rb
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 61629)
+++ ruby_2_5/version.h	(revision 61630)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #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
Index: ruby_2_5/test/ruby/test_optimization.rb
===================================================================
--- ruby_2_5/test/ruby/test_optimization.rb	(revision 61629)
+++ ruby_2_5/test/ruby/test_optimization.rb	(revision 61630)
@@ -689,7 +689,7 @@ class TestRubyOptimization < Test::Unit: https://github.com/ruby/ruby/blob/trunk/ruby_2_5/test/ruby/test_optimization.rb#L689
   end
 
   def test_clear_unreachable_keyword_args
-    assert_separately [], <<-END
+    assert_separately [], <<-END, timeout: 15
       script =  <<-EOS
         if true
         else
Index: ruby_2_5/test/ruby/test_proc.rb
===================================================================
--- ruby_2_5/test/ruby/test_proc.rb	(revision 61629)
+++ ruby_2_5/test/ruby/test_proc.rb	(revision 61630)
@@ -1325,7 +1325,7 @@ class TestProc < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_5/test/ruby/test_proc.rb#L1325
   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
 
Index: ruby_2_5/test/lib/envutil.rb
===================================================================
--- ruby_2_5/test/lib/envutil.rb	(revision 61629)
+++ ruby_2_5/test/lib/envutil.rb	(revision 61630)
@@ -147,7 +147,7 @@ module EnvUtil https://github.com/ruby/ruby/blob/trunk/ruby_2_5/test/lib/envutil.rb#L147
       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
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 61629)
+++ ruby_2_5	(revision 61630)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61625-61627

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/