From 2386407223a5074a25e1a3827ed2e1be81ec3a40 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Oct 2014 03:27:37 +0000
Subject: * test/ruby/envutil.rb (assert_regexp_list): New assertion method.

* test/ruby/test_rubyoptions.rb: Use assert_regexp_list.



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

(limited to 'test/ruby/test_rubyoptions.rb')

diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 25e5fe6d96..7967415ec5 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -536,7 +536,9 @@ class TestRubyOptions < Test::Unit::TestCase
           --\sC\slevel\sbacktrace\sinformation\s-------------------------------------------\n
           (?:(?:.*\s)?\[0x\h+\]\n)*\n
         )?
-        (?m:.*)
+      )x,
+      :*,
+      %r(
         \[NOTE\]\n
         You\smay\shave\sencountered\sa\sbug\sin\sthe\sRuby\sinterpreter\sor\sextension\slibraries.\n
         Bug\sreports\sare\swelcome.\n
@@ -559,15 +561,7 @@ class TestRubyOptions < Test::Unit::TestCase
       EnvUtil.diagnostic_reports(Signal.signame(signo), EnvUtil.rubybin, status.pid, Time.now)
     end
 
-    str = stderr
-    SEGVTest::ExpectedStderrList.each {|regexp|
-      r = /\A#{regexp}/
-      unless r =~ str
-        assert_match(r, str, message)
-      end
-      str = $'
-    }
-    assert_equal('', str)
+    assert_regexp_list(SEGVTest::ExpectedStderrList, stderr, message)
 
     status
   end
-- 
cgit v1.2.3