* 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

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