diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-08 10:45:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-08 10:45:21 +0000 |
| commit | fa7a5d5477dd8015b9bc0be9dc7ef2bf583e46d8 (patch) | |
| tree | 4133ff567ecee458d18ef66b74c64b7e239b509e /test | |
| parent | 4732bf25f5a965ebee61971184af3a64c0cf90d3 (diff) | |
| download | ruby-fa7a5d5477dd8015b9bc0be9dc7ef2bf583e46d8.tar.gz | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@6125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/drb/drbtest.rb | 8 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 1 | ||||
| -rw-r--r-- | test/runner.rb | 1 | ||||
| -rw-r--r-- | test/soap/calc/test_calc_cgi.rb | 9 |
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 |