nagachika	2016-08-24 23:56:53 +0900 (Wed, 24 Aug 2016)

  New Revision: 56002

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

  Log:
    merge revision(s) 53586,53587,54030: [Backport #12331]
    
    increase timeout for ARMv7
    
    http://rubyci.s3.amazonaws.com/scw-9d6766/ruby-trunk/log/20160113T091704Z.diff.html.gz
    * test/ruby/test_array.rb: split out the test for no stack error
      on large input for test_permutation, test_repeated_permutation,
      and test_repeated_combination, and make them all timeout:30.

  Added files:
    branches/ruby_2_3/test/excludes/TestISeq.rb
  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/test/ruby/test_array.rb
    branches/ruby_2_3/test/ruby/test_iseq.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 56001)
+++ ruby_2_3/version.h	(revision 56002)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-08-23"
-#define RUBY_PATCHLEVEL 176
+#define RUBY_RELEASE_DATE "2016-08-24"
+#define RUBY_PATCHLEVEL 177
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 
Index: ruby_2_3/test/ruby/test_iseq.rb
===================================================================
--- ruby_2_3/test/ruby/test_iseq.rb	(revision 56001)
+++ ruby_2_3/test/ruby/test_iseq.rb	(revision 56002)
@@ -187,7 +187,7 @@ class TestISeq < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_iseq.rb#L187
   end
 
   def test_parent_iseq_mark
-    assert_separately([], <<-'end;')
+    assert_separately([], <<-'end;', timeout: 20)
       ->{
         ->{
           ->{
Index: ruby_2_3/test/ruby/test_array.rb
===================================================================
--- ruby_2_3/test/ruby/test_array.rb	(revision 56001)
+++ ruby_2_3/test/ruby/test_array.rb	(revision 56002)
@@ -1819,7 +1819,9 @@ class TestArray < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_array.rb#L1819
 
     bug3708 = '[ruby-dev:42067]'
     assert_equal(b, @cls[0, 1, 2, 3, 4][1, 4].permutation.to_a, bug3708)
+  end
 
+  def test_permutation_stack_error
     bug9932 = '[ruby-core:63103] [Bug #9932]'
     assert_separately([], <<-"end;") #    do
       assert_nothing_raised(SystemStackError, "#{bug9932}") do
@@ -1851,8 +1853,10 @@ class TestArray < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_array.rb#L1853
 
     a = @cls[0, 1, 2, 3, 4][1, 4].repeated_permutation(2)
     assert_empty(a.reject {|x| !x.include?(0)})
+  end
 
-    assert_separately([], <<-"end;") #    do
+  def test_repeated_permutation_stack_error
+    assert_separately([], <<-"end;", timeout: 30) #    do
       assert_nothing_raised(SystemStackError) do
         assert_equal(:ok, Array.new(100_000, nil).repeated_permutation(500_000) {break :ok})
       end
@@ -1886,8 +1890,10 @@ class TestArray < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_array.rb#L1890
 
     a = @cls[0, 1, 2, 3, 4][1, 4].repeated_combination(2)
     assert_empty(a.reject {|x| !x.include?(0)})
+  end
 
-    assert_separately([], <<-"end;") #    do
+  def test_repeated_combination_stack_error
+    assert_separately([], <<-"end;", timeout: 20) #    do
       assert_nothing_raised(SystemStackError) do
         assert_equal(:ok, Array.new(100_000, nil).repeated_combination(500_000) {break :ok})
       end
Index: ruby_2_3/test/excludes/TestISeq.rb
===================================================================
--- ruby_2_3/test/excludes/TestISeq.rb	(revision 0)
+++ ruby_2_3/test/excludes/TestISeq.rb	(revision 56002)
@@ -0,0 +1 @@
+exclude :test_parent_iseq_mark, "time consuming test"

Property changes on: ruby_2_3/test/excludes/TestISeq.rb
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 56001)
+++ ruby_2_3/ChangeLog	(revision 56002)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Aug 24 23:54:40 2016  Charles Oliver Nutter  <headius@h...>
+
+	* test/ruby/test_array.rb: split out the test for no stack error
+	  on large input for test_permutation, test_repeated_permutation,
+	  and test_repeated_combination, and make them all timeout:30.
+
 Tue Aug 23 03:22:34 2016  Naohisa Goto  <ngotogenome@g...>
 
 	* test/fiddle/test_pointer.rb (test_to_str, test_to_s, test_aref_aset):

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53586-53587,54030


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