From 1bd47bf0bc2051affae12a3a420abf2b44660389 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Jul 2004 09:05:08 +0000
Subject: * eval.c (rb_call0): should call rb_call_super() directly for  
 visibility overriding.  [ruby-dev:23989]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/drb/drbtest.rb      |  4 ++--
 test/openssl/test_ssl.rb | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 6fd0f94d5e..13f879558f 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -14,9 +14,9 @@ class DRbService
   @@manager = DRb::ExtServManager.new
   @@ruby = EnvUtil.rubybin
   @@ruby += " -d" if $DEBUG
-  @@dir = File.dirname(File.expand_path(__FILE__))
   def self.add_service_command(nm)
-    DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}"
+    dir = File.dirname(File.expand_path(__FILE__))
+    DRb::ExtServManager.command[nm] = "#{@@ruby} #{dir}/#{nm}"
   end
 
   %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm|
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 60e9f46b79..dbc8f13902 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -6,14 +6,18 @@ end
 require "rbconfig"
 require "socket"
 require "test/unit"
+begin
+  loadpath = $:.dup
+  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+  require 'envutil'
+ensure
+  $:.replace(loadpath)
+end
 
 if defined?(OpenSSL)
 
 class OpenSSL::TestSSL < Test::Unit::TestCase
-  RUBY = ENV["RUBY"] || File.join(
-    ::Config::CONFIG["bindir"],
-    ::Config::CONFIG["ruby_install_name"] + ::Config::CONFIG["EXEEXT"]
-  )
+  RUBY = EnvUtil.rubybin
   SSL_SERVER = File.join(File.dirname(__FILE__), "ssl_server.rb")
   PORT = 20443
   ITERATIONS = ($0 == __FILE__) ? 100 : 10
-- 
cgit v1.2.3