From 7971aa6cdab3ac6dbb85533d43bde83c0880febc Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Apr 2004 10:45:21 +0000
Subject: * ext/extmk.rb (extmake): skip uncompiled extensions.

* lib/mkmf.rb (create_makefile): emit no rules for static library if
  $static is nil, e.g., outside of ext/.

* lib/test/unit/ui/console/testrunner.rb (test_started): show test
  name via $0.

* runruby.rb: set environments to use the compiled binary.

* test/runner.rb: do nothing while cross-compiling.

* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: use envutil to
  know ruby binary.

* test/ruby/envutil.rb: give priority to RUBY environment variable to
  use just compiled binary and libraries.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/soap/calc/test_calc_cgi.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'test/soap')

diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index d1655b0b0..6b2632946 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
-- 
cgit