From d9f21245adccdc3b85860aef97b68a3faf3f1884 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 28 Oct 2008 01:25:01 +0000 Subject: merged r19973 from trunk into ruby_1_9_1. * bootstraptest/test_thread.rb: ignore some exceptions. [ruby-dev:36951] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@19974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- bootstraptest/test_thread.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bootstraptest') diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb index f9a5beef2d..ce90737ebf 100644 --- a/bootstraptest/test_thread.rb +++ b/bootstraptest/test_thread.rb @@ -363,5 +363,9 @@ assert_equal 'ok', %q{ }, '[ruby-dev:35414]' assert_equal 'ok', %q{ - 10000.times { Thread.new(true) {|x| x == false } }; :ok + begin + 10000.times { Thread.new(true) {|x| x == false } } + rescue NoMemoryError, StandardError + end + :ok } -- cgit v1.2.3