usa	2012-09-20 10:59:52 +0900 (Thu, 20 Sep 2012)

  New Revision: 36995

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36995

  Log:
    * test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning
      with another method.  if the substitution is removed, the ExtSrv
      object will be GC'ed and some tests will be blocked.

  Modified files:
    trunk/ChangeLog
    trunk/test/drb/ut_drb.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36994)
+++ ChangeLog	(revision 36995)
@@ -1,3 +1,11 @@
+<<<<<<< .mine
+Thu Sep 20 10:56:08 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning
+	  with another method.  if the substitution is removed, the ExtSrv
+	  object will be GC'ed and some tests will be blocked.
+
+=======
 Thu Sep 20 10:30:00 2012  Zachary Scott  <zzak@r...>
 
 	* lib/find.rb: Error in documentation example
@@ -3,4 +11,5 @@
 	  Found by Herwin Weststrate, thank you!
 
+>>>>>>> .r36994
 Thu Sep 20 07:20:00 2012  Zachary Scott  <zzak@r...>
 
Index: test/drb/ut_drb.rb
===================================================================
--- test/drb/ut_drb.rb	(revision 36994)
+++ test/drb/ut_drb.rb	(revision 36995)
@@ -157,6 +157,7 @@
   DRb::DRbServer.default_argc_limit(8)
   DRb::DRbServer.default_load_limit(4096)
   DRb.start_service('druby://localhost:0', DRbEx.new)
-  DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
   DRb.thread.join
+  es.stop_service if es.alive?
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/