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

1 files changed, 5 insertions, 1 deletions

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
 }