diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-27 02:00:19 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-27 02:00:19 +0000 |
commit | b1a18cf49bc475e6c563f55b23fa36594d70f4bc (patch) | |
tree | 0dc0c659cd7a5cfd335118f1c263978277fa6d35 /test/ruby/test_thread.rb | |
parent | 8079f8a6f25bd1e6ef9fa0bff569a850c31c6fb3 (diff) | |
download | ruby-b1a18cf49bc475e6c563f55b23fa36594d70f4bc.tar.gz |
* thread.c (thread_join): raises ThreadError if target therad
is a main thread.
* test/ruby/test_thread.rb (test_thread_join_main_thread):
test for the above.
* NEWS: news for the above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_thread.rb')
-rw-r--r-- | test/ruby/test_thread.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 95f2c89db4..fb2efec552 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -881,4 +881,12 @@ class TestThreadGroup < Test::Unit::TestCase Thread.current.join end end + + def test_thread_join_main_thread + assert_raises(ThreadError) do + Thread.new(Thread.current) {|t| + t.join + }.join + end + end end |