diff options
-rw-r--r-- | test/ruby/envutil.rb | 22 | ||||
-rw-r--r-- | test/webrick/test_filehandler.rb | 2 |
2 files changed, 20 insertions, 4 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index e54051d426..741aa75ce3 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -20,10 +20,9 @@ module EnvUtil end ruby = File.join("..", ruby) end - begin - require "rbconfig" + if defined?(RbConfig.ruby) RbConfig.ruby - rescue LoadError + else "ruby" end end @@ -202,3 +201,20 @@ module Test end end +begin + require 'rbconfig' +rescue LoadError +else + module RbConfig + @ruby = EnvUtil.rubybin + class << self + undef ruby if defined?(ruby) + attr_reader :ruby + end + dir = File.dirname(ruby) + name = File.basename(ruby, CONFIG['EXEEXT']) + CONFIG['bindir'] = dir + CONFIG['ruby_install_name'] = name + CONFIG['RUBY_INSTALL_NAME'] = name + end +end diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb index 712ff7b1cd..2572e3a678 100644 --- a/test/webrick/test_filehandler.rb +++ b/test/webrick/test_filehandler.rb @@ -1,7 +1,7 @@ require "test/unit" +require File.join(File.dirname(__FILE__), "utils.rb") require "webrick" require "stringio" -require File.join(File.dirname(__FILE__), "utils.rb") class WEBrick::TestFileHandler < Test::Unit::TestCase def default_file_handler(filename) |