summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bootstraptest/test_thread.rb6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 332d703..7fbb07a 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 f9a5bee..ce90737 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
}