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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Dec 2, 2018 · f35b27b · f35b27b
1 parent 0812ab5
commit f35b27b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
@@ -394,7 +394,12 @@ class C   # line 7 empty class
   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

diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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