From 131473cf270b6bf2b2d8666b166ecce846eda16c Mon Sep 17 00:00:00 2001
From: seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Mar 2004 05:41:25 +0000
Subject: rescue LoadError.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  7 +++++++
 test/drb/test_drbssl.rb  | 13 +++++++++++--
 test/drb/test_drbunix.rb | 13 +++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba46021bd..ff9476f35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar 13 14:28:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/test_drbssl.rb: rescue LoadError. (Barkport from main 
+	  trunk)
+
+	* test/drb/test_drbunix.rb: ditto.
+
 Wed Mar 10 22:28:09 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (remove_dir): should handle symlink correctly.
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index 0ca177fe5..b5dd68f6a 100644
--- a/test/drb/test_drbssl.rb
+++ b/test/drb/test_drbssl.rb
@@ -1,6 +1,12 @@
-$:.unshift(File.dirname(File.expand_path(__FILE__)))
 require 'drbtest'
-require 'drb/ssl'
+
+begin
+  require 'drb/ssl'
+rescue LoadError
+end
+
+if Object.const_defined?("OpenSSL")
+
 
 class DRbSSLService < DRbService
   %w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm|
@@ -63,3 +69,6 @@ class TestDRbSSLAry < Test::Unit::TestCase
     @there = @ext.front
   end
 end
+
+
+end
diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb
index e05637a2b..e35a7bd58 100644
--- a/test/drb/test_drbunix.rb
+++ b/test/drb/test_drbunix.rb
@@ -1,6 +1,12 @@
-$:.unshift(File.dirname(File.expand_path(__FILE__)))
 require 'drbtest'
-require 'drb/unix'
+
+begin
+  require 'drb/unix'
+rescue LoadError
+end
+
+if Object.const_defined?("UNIXServer")
+
 
 class DRbUNIXService < DRbService
   %w(ut_drb_drbunix.rb ut_array_drbunix.rb).each do |nm|
@@ -46,3 +52,6 @@ class TestDRbUNIXAry < Test::Unit::TestCase
     @there = @ext.front
   end
 end
+
+
+end
-- 
cgit