summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@ruby-lang.org>2009-09-12 17:00:51 +0000
committernaruse <naruse@ruby-lang.org>2009-09-12 17:00:51 +0000
commit50f8cac5e40f4b7b708912592e0059bb8b86fcdc (patch)
tree7f9b67d2c3e50b345d44ff176e63f15959729cae /test
parentead4785f4d01b6a956daaa3c4fafd6e92fec6ca4 (diff)
downloadruby-openssl-history-50f8cac5e40f4b7b708912592e0059bb8b86fcdc.tar.gz
* 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')
-rw-r--r--test/test_pair.rb5
-rw-r--r--test/test_ssl.rb10
2 files changed, 3 insertions, 12 deletions
diff --git a/test/test_pair.rb b/test/test_pair.rb
index fb0662f..d25a59b 100644
--- a/test/test_pair.rb
+++ b/test/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/test_ssl.rb b/test/test_ssl.rb
index 4688552..e86b821 100644
--- a/test/test_ssl.rb
+++ b/test/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)