diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-28 01:25:01 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-28 01:25:01 +0000 |
| commit | d9f21245adccdc3b85860aef97b68a3faf3f1884 (patch) | |
| tree | abf9c23b6cdbc2c1f0641ffba3db90757566ce80 | |
| parent | 067071c01640bfc54b81b185195b0a548661397f (diff) | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bootstraptest/test_thread.rb | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -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 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 } |