merged from ruby_1_8 branch.

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

4 files changed, 2 insertions, 25 deletions

diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 40f71c307a..bc16ab1ca2 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -1,5 +1,3 @@
-
-__END__
 require 'test/unit'
 require 'drb/drb'
 require 'drb/extservm'
@@ -24,7 +22,7 @@ class DRbService
   %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm|
     add_service_command(nm)
   end
-  @server = @@server = DRb::DRbServer.new(nil, @@manager, {})
+  @server = @@server = DRb::DRbServer.new('druby://localhost:0', @@manager, {})
   @@manager.uri = @@server.uri
   def self.manager
     @@manager
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index a03210eb98..5719f60b80 100644
--- a/test/drb/test_drb.rb
+++ b/test/drb/test_drb.rb
@@ -1,17 +1,5 @@
 require 'drbtest'
 
-class TestDRbCore
-  def test_drb
-    flunk("YARV doesn't support drb")
-  end
-end
-
-__END__
-
-end
-
-__END__
-
 class TestDRbCore < Test::Unit::TestCase
   include DRbCore
 end
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index 4c87201362..cfb3bc36a4 100644
--- a/test/drb/test_drbssl.rb
+++ b/test/drb/test_drbssl.rb
@@ -5,14 +5,8 @@ begin
 rescue LoadError
 end
 
-class TestDRbSSLCore < Test::Unit::TestCase
-  def test_message
-    flunk("YARV doesn't support drb")
-  end
-end
+if Object.const_defined?("OpenSSL")
 
-# TODO: YARV doesn't support drb
-if false # Object.const_defined?("OpenSSL")
 
 class DRbSSLService < DRbService
   %w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm|
diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb
index c2d7dea68c..e1a17edd3d 100644
--- a/test/drb/test_drbunix.rb
+++ b/test/drb/test_drbunix.rb
@@ -1,6 +1,3 @@
-
-__END__
-
 require 'drbtest'
 
 begin