* test/xmlrpc/webrick_testing.rb: join webrick server thread.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d082bce2c..8b955e212e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 15 23:50:31 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc/webrick_testing.rb: join webrick server thread.
+
 Sat Dec 15 22:27:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (BUILTIN_ENCS): splitted command line instead of
diff --git a/test/xmlrpc/webrick_testing.rb b/test/xmlrpc/webrick_testing.rb
index eb054a77e7..2ca52bad22 100644
--- a/test/xmlrpc/webrick_testing.rb
+++ b/test/xmlrpc/webrick_testing.rb
@@ -10,7 +10,7 @@ module WEBrick_Testing
     raise "already started" if @__server
     @__started = false
 
-    Thread.new {
+    @__server_thread = Thread.new {
       @__server = WEBrick::HTTPServer.new(
         { 
           :Logger => DummyLog.new,
@@ -32,6 +32,7 @@ module WEBrick_Testing
       @__server.shutdown
       Thread.pass while @__started # wait until the server is down
     }
+    @__server_thread.join
     @__server = nil
   end
 end