summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-12 04:59:01 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-12 04:59:01 +0000
commit8d959df0e258b5f11dc4497919016e605b98b17a (patch)
tree4f391ba71371e79684e05ee004def7bbe8ee218f
parent618d3861bd2def033ca638fb1572ab72a0af7393 (diff)
downloadruby-8d959df0e258b5f11dc4497919016e605b98b17a.tar.gz
ruby-8d959df0e258b5f11dc4497919016e605b98b17a.tar.xz
ruby-8d959df0e258b5f11dc4497919016e605b98b17a.zip
* test/drb/test_drb{ssl,unix}.rb: can test drb
before install. (backported from HEAD) [ruby-dev:26146] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/drb/test_drbssl.rb4
-rw-r--r--test/drb/test_drbunix.rb4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e6ef1975..feeb433ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 12 13:47:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * test/drb/test_drb{ssl,unix}.rb: can test drb
+ before install. (backported from HEAD) [ruby-dev:26146]
+
Thu May 12 09:53:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* version.c (ruby_show_version): flush for non-tty stdout.
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index b68eb12ca..cfb3bc36a 100644
--- a/test/drb/test_drbssl.rb
+++ b/test/drb/test_drbssl.rb
@@ -10,7 +10,7 @@ if Object.const_defined?("OpenSSL")
class DRbSSLService < DRbService
%w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm|
- DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}"
+ add_service_command(nm)
end
config = Hash.new
@@ -30,7 +30,7 @@ class DRbSSLService < DRbService
end
uri = ARGV.shift if $0 == __FILE__
- @server = DRb::DRbServer.new(uri || 'drbssl://:0', @@manager, config)
+ @server = DRb::DRbServer.new(uri || 'drbssl://:0', self.manager, config)
end
class TestDRbSSLCore < Test::Unit::TestCase
diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb
index 79747ae44..e1a17edd3 100644
--- a/test/drb/test_drbunix.rb
+++ b/test/drb/test_drbunix.rb
@@ -10,11 +10,11 @@ if Object.const_defined?("UNIXServer")
class DRbUNIXService < DRbService
%w(ut_drb_drbunix.rb ut_array_drbunix.rb).each do |nm|
- DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}"
+ add_service_command(nm)
end
uri = ARGV.shift if $0 == __FILE__
- @server = DRb::DRbServer.new(uri || 'drbunix:', @@manager, {})
+ @server = DRb::DRbServer.new(uri || 'drbunix:', self.manager, {})
end
class TestDRbUNIXCore < Test::Unit::TestCase