diff options
| -rw-r--r-- | test/ruby/envutil.rb | 25 | ||||
| -rw-r--r-- | test/webrick/test_filehandler.rb | 2 |
2 files changed, 22 insertions, 5 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index e0d8cf81be..639aee00ca 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -15,15 +15,32 @@ module EnvUtil end ruby = File.join("..", ruby) end - begin - require "rbconfig" + if defined?(RbConfig.ruby) File.join( Config::CONFIG["bindir"], Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] - ) - rescue LoadError + ) + else "ruby" end end module_function :rubybin 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 2c7d97fa70..a31dc07dd6 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) |