From 00679d202d17bc629e02632801eac7c1bc7490c8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 13 Feb 2019 11:36:15 +0000
Subject: Fix rb_bug message pattern list

Each setions are separated by an empty line, and C level backtrace
information format has been changed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_rubyoptions.rb | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 4ae466b9a2..c8108bc313 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -669,7 +669,7 @@ class TestRubyOptions < Test::Unit::TestCase
 
   module SEGVTest
     opts = {}
-    if /mswin|mingw/ =~ RUBY_PLATFORM
+    if /mswin|mingw|darwin/ =~ RUBY_PLATFORM
       additional = /[\s\w\.\']*/
     else
       opts[:rlimit_core] = 0
@@ -688,21 +688,32 @@ class TestRubyOptions < Test::Unit::TestCase
         (?:--\s(?:.+\n)*\n)?
         --\sControl\sframe\sinformation\s-+\n
         (?:c:.*\n)*
+        \n
       )x,
       %r(
         (?:
         --\sRuby\slevel\sbacktrace\sinformation\s----------------------------------------\n
         -e:1:in\s\`<main>\'\n
         -e:1:in\s\`kill\'\n
+        \n
         )?
       )x,
+      %r(
+        (?:--\sMachine(?:.+\n)*\n)?
+      )x,
       %r(
         (?:
           --\sC\slevel\sbacktrace\sinformation\s-------------------------------------------\n
-          (?:(?:.*\s)?\[0x\h+\]\n)*\n
+          (?:(?:.*\s)?\[0x\h+\].*\n|.*:\d+\n)*\n
+        )?
+      )x,
+      %r(
+        (?:--\sOther\sruntime\sinformation\s-+\n
+          (?:\n\*\s.*\n
+            (?:\n(?:\s.*\n)+)?
+          )*
         )?
       )x,
-      :*,
     ]
     ExpectedStderrList << additional if additional
   end
-- 
cgit v1.2.3