diff options
Diffstat (limited to 'test/openssl')
-rw-r--r-- | test/openssl/test_pair.rb | 5 | ||||
-rw-r--r-- | test/openssl/test_ssl.rb | 10 |
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) |