4 files changed, 8 insertions, 11 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index c95b900235..dad26759c0 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -2,14 +2,12 @@ require 'test/unit'
 require 'drb/drb'
 require 'drb/extservm'
 require 'timeout'
-require 'rbconfig'
+$:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+require 'envutil'
 
 class DRbService
   @@manager = DRb::ExtServManager.new
-  @@ruby = File.join(
-    Config::CONFIG["bindir"],
-    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
-  )
+  @@ruby = EnvUtil.rubybin
   @@ruby += " -d" if $DEBUG
   @@dir = File.dirname(File.expand_path(__FILE__))
   def self.manager
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 4bae3d9e3b..38dba96c93 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -9,6 +9,7 @@ module EnvUtil
     end
     begin
       require "rbconfig"
+      ENV["RUBY"] or
       File.join(
         Config::CONFIG["bindir"],
 	Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
diff --git a/test/runner.rb b/test/runner.rb
index 4ecc35aecc..d491b053a8 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -1,3 +1,4 @@
+exit if defined?(CROSS_COMPILING)
 require 'test/unit'
 
 rcsid = %w$Id$
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index d1655b0b01..6b26329460 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -2,7 +2,8 @@ require 'test/unit'
 require 'soap/rpc/driver'
 require 'logger'
 require 'webrick'
-require 'rbconfig'
+$:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+require 'envutil'
 
 
 module SOAP
@@ -10,11 +11,7 @@ module Calc
 
 
 class TestCalcCGI < Test::Unit::TestCase
-  # This test shuld be run after installing ruby.
-  RUBYBIN = File.join(
-    Config::CONFIG["bindir"],
-    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
-  )
+  RUBYBIN = EnvUtil.rubybin
   RUBYBIN << " -d" if $DEBUG
 
   Port = 17171