From 6b88aa17bbd2b076f8c33efa26e445df5215d184 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@19974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                    | 5 +++++
 bootstraptest/test_thread.rb | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 332d70360..7fbb07a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 28 09:51:48 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bootstraptest/test_thread.rb: ignore some exceptions.
+	  [ruby-dev:36951]
+
 Tue Oct 28 09:19:40 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (RUNRUBY): now ruby requires something from
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index f9a5beef2..ce90737eb 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