merge from trunk (r27796)

* test/ruby/test_rubyoptions.rb (test_segv_test): VC runtime adds some messages
  when SEGV occurs


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 2 deletions

diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 3364d1c7be..f5bc830830 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -365,6 +365,13 @@ class TestRubyOptions < Test::Unit::TestCase
   end
 
   def test_segv_test
+    if /mswin|mingw/ =~ RUBY_PLATFORM
+      opts = {}
+      additional = '[\s\w\.\']*'
+    else
+      opts[:rlimit_core] = 0
+      additional = ""
+    end
     assert_in_out_err(["-e", "Process.kill :SEGV, $$"], "", [],
       %r(\A
       -e:(?:1:)?\s\[BUG\]\sSegmentation\sfault\n
@@ -385,9 +392,12 @@ class TestRubyOptions < Test::Unit::TestCase
       \[NOTE\]\n
       You\smay\shave\sencountered\sa\sbug\sin\sthe\sRuby\sinterpreter\sor\sextension\slibraries.\n
       Bug\sreports\sare\swelcome.\n
-      For\sdetails:\shttp:\/\/www.ruby-lang.org/bugreport.html\n\n\z
+      For\sdetails:\shttp:\/\/www.ruby-lang.org/bugreport.html\n
+      \n
+      (?:#{additional})
+      \z
       )x,
       nil,
-      :rlimit_core=>0)
+      opts)
   end
 end