mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2a50cecab8
commit
a9fefe7555
2 changed files with 11 additions and 1 deletions
|
@ -1,8 +1,17 @@
|
||||||
|
<<<<<<< .mine
|
||||||
|
Thu Sep 20 10:56:08 2012 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* 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@ruby-lang.org>
|
Thu Sep 20 10:30:00 2012 Zachary Scott <zzak@ruby-lang.org>
|
||||||
|
|
||||||
* lib/find.rb: Error in documentation example
|
* lib/find.rb: Error in documentation example
|
||||||
Found by Herwin Weststrate, thank you!
|
Found by Herwin Weststrate, thank you!
|
||||||
|
|
||||||
|
>>>>>>> .r36994
|
||||||
Thu Sep 20 07:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
|
Thu Sep 20 07:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
|
||||||
|
|
||||||
* complex.c: Examples for Complex Documentation.
|
* complex.c: Examples for Complex Documentation.
|
||||||
|
|
|
@ -157,6 +157,7 @@ if __FILE__ == $0
|
||||||
DRb::DRbServer.default_argc_limit(8)
|
DRb::DRbServer.default_argc_limit(8)
|
||||||
DRb::DRbServer.default_load_limit(4096)
|
DRb::DRbServer.default_load_limit(4096)
|
||||||
DRb.start_service('druby://localhost:0', DRbEx.new)
|
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
|
DRb.thread.join
|
||||||
|
es.stop_service if es.alive?
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue