[前][次][番号順一覧][スレッド一覧]

ruby-changes:15861

From: usa <ko1@a...>
Date: Fri, 14 May 2010 14:01:56 +0900 (JST)
Subject: [ruby-changes:15861] Ruby:r27797 (ruby_1_9_2): merge from trunk (r27796)

usa	2010-05-14 14:00:18 +0900 (Fri, 14 May 2010)

  New Revision: 27797

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27797

  Log:
    merge from trunk (r27796)
    
    * test/ruby/test_rubyoptions.rb (test_segv_test): VC runtime adds some messages
      when SEGV occurs

  Modified files:
    branches/ruby_1_9_2/test/ruby/test_rubyoptions.rb

Index: ruby_1_9_2/test/ruby/test_rubyoptions.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_rubyoptions.rb	(revision 27796)
+++ ruby_1_9_2/test/ruby/test_rubyoptions.rb	(revision 27797)
@@ -365,6 +365,13 @@
   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 @@
       \[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

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

[前][次][番号順一覧][スレッド一覧]