summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-12 07:41:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-12 07:41:40 +0000
commit8f3f9d715f39ccafaa576b245865b70c272fc047 (patch)
tree1df3d29fb976fc2dccef8a609e6f2253bd29093e /test
parenta6b81a6b6ef32cce224bff019e11bbe8118daee9 (diff)
* test/ruby/envutil.rb (EnvUtil#rubybin): fake also rbconfig.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/envutil.rb22
-rw-r--r--test/webrick/test_filehandler.rb2
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)