nagachika	2018-12-02 16:37:49 +0900 (Sun, 02 Dec 2018)

  New Revision: 66131

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

  Log:
    merge revision(s) 62776: [Backport #15365]
    
    test_iseq.rb: skip iseq with coverage
    
    * test/ruby/test_iseq.rb (test_to_binary_with_objects): #to_binary
      does not support iseq compiled with coverage, just skip.

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/test/ruby/test_iseq.rb
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 66130)
+++ ruby_2_5/version.h	(revision 66131)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.4"
 #define RUBY_RELEASE_DATE "2018-12-02"
-#define RUBY_PATCHLEVEL 117
+#define RUBY_PATCHLEVEL 118
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 12
Index: ruby_2_5/test/ruby/test_iseq.rb
===================================================================
--- ruby_2_5/test/ruby/test_iseq.rb	(revision 66130)
+++ ruby_2_5/test/ruby/test_iseq.rb	(revision 66131)
@@ -394,7 +394,12 @@ class TestISeq < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_5/test/ruby/test_iseq.rb#L394
   def test_to_binary_with_objects
     code = "[]"+100.times.map{|i|"<</#{i}/"}.join
     iseq = RubyVM::InstructionSequence.compile(code)
-    bin = assert_nothing_raised {iseq.to_binary}
+    bin = assert_nothing_raised do
+      iseq.to_binary
+    rescue RuntimeError => e
+      skip e.message if /compile with coverage/ =~ e.message
+      raise
+    end
     iseq2 = RubyVM::InstructionSequence.load_from_binary(bin)
     assert_equal(iseq2.to_a, iseq.to_a)
   end
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 66130)
+++ ruby_2_5	(revision 66131)

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

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