From 2188bcf815dab243b7d317a085267c278f2d64c2 Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 11 May 2008 10:06:58 +0000
Subject: * test/ruby/test_thread.rb: kill and join temporal threads that are  
 created in each test.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  5 +++++
 test/ruby/test_thread.rb | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 07aeb1171..925504cb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 11 19:04:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_thread.rb: kill and join temporal threads that are
+	  created in each test.
+ 
 Sun May 11 17:58:45 2008  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/test_process.rb (TestProcess#with_stdin): defined.
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index bdb9ec24f..9abe39b10 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -8,13 +8,29 @@ class TestThread < Test::Unit::TestCase
   end
 
   class Thread < ::Thread
+    Threads = []
     def self.new(*)
       th = super
       th.abort_on_exception = true
+      Threads << th
       th
     end
   end
 
+  def setup
+    Thread::Threads.clear
+  end
+
+  def teardown
+    Thread::Threads.each do |t|
+      t.kill if t.alive?
+      begin
+        t.join
+      rescue Exception
+      end
+    end
+  end
+
   def test_mutex_synchronize
     m = Mutex.new
     r = 0
-- 
cgit