summaryrefslogtreecommitdiff
path: root/test/openssl
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-12 17:00:51 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-12 17:00:51 +0000
commit6bbed0e31b1d32808443b3dd3e451aad28d46096 (patch)
treea4b8e71ae84ea8515f5eb9116e5a4d44b0c6e50c /test/openssl
parent945b604e3adc16aaf421a6df80d40a00a70a9226 (diff)
* test: use require_relative.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl')
-rw-r--r--test/openssl/test_pair.rb5
-rw-r--r--test/openssl/test_ssl.rb10
2 files changed, 3 insertions, 12 deletions
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index fb0662f501..d25a59b740 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -7,10 +7,7 @@ require 'test/unit'
if defined?(OpenSSL)
require 'socket'
-dir = File.expand_path(__FILE__)
-2.times {dir = File.dirname(dir)}
-$:.replace([File.join(dir, "ruby")] | $:)
-require 'ut_eof'
+require_relative '../ruby/ut_eof'
module SSLPair
def server
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 4688552cd3..e86b82110b 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -1,18 +1,12 @@
begin
require "openssl"
- require File.join(File.dirname(__FILE__), "utils.rb")
+ require_relative "utils.rb"
rescue LoadError
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
+require_relative '../ruby/envutil'
if defined?(OpenSSL)