diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-20 08:34:53 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-20 08:34:53 +0000 |
| commit | c606dc09e102189ae9a652aeff0816b554c0fa4d (patch) | |
| tree | 6a57539965332280eabf8a66736b066052e73142 /test | |
| parent | 5a778f3bd05fff7021a065c12c0b3260b0710ab3 (diff) | |
| download | ruby-c606dc09e102189ae9a652aeff0816b554c0fa4d.tar.gz ruby-c606dc09e102189ae9a652aeff0816b554c0fa4d.tar.xz ruby-c606dc09e102189ae9a652aeff0816b554c0fa4d.zip | |
* mkconfig.rb: generate RbConfig instead of Config.
* instruby.rb, rubytest.rb, runruby.rb, bcc32/Makefile.sub,
ext/extmk.rb, ext/dl/extconf.rb, ext/iconv/charset_alias.rb,
lib/mkmf.rb, lib/rdoc/ri/ri_paths.rb,
lib/webrick/httpservlet/cgihandler.rb,
test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb,
test/ruby/envutil.rb, test/soap/calc/test_calc_cgi.rb,
test/soap/header/test_authheader_cgi.rb, test/soap/ssl/test_ssl.rb,
win32/mkexports.rb, win32/resource.rb: Use RbConfig instead of
Config.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/dbm/test_dbm.rb | 4 | ||||
| -rw-r--r-- | test/gdbm/test_gdbm.rb | 4 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 4 | ||||
| -rw-r--r-- | test/soap/calc/test_calc_cgi.rb | 4 | ||||
| -rw-r--r-- | test/soap/header/test_authheader_cgi.rb | 4 | ||||
| -rw-r--r-- | test/soap/ssl/test_ssl.rb | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb index cec2b20f9..04ec0973d 100644 --- a/test/dbm/test_dbm.rb +++ b/test/dbm/test_dbm.rb @@ -12,7 +12,7 @@ if defined? DBM class TestDBM < Test::Unit::TestCase def TestDBM.uname_s require 'rbconfig' - case Config::CONFIG['host_os'] + case RbConfig::CONFIG['host_os'] when 'cygwin' require 'Win32API' uname = Win32API.new('cygwin1', 'uname', 'P', 'I') @@ -21,7 +21,7 @@ if defined? DBM utsname.unpack('A20' * 5)[0] else - Config::CONFIG['host_os'] + RbConfig::CONFIG['host_os'] end end SYSTEM = uname_s diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb index db4a65643..45fc93bcc 100644 --- a/test/gdbm/test_gdbm.rb +++ b/test/gdbm/test_gdbm.rb @@ -12,7 +12,7 @@ if defined? GDBM class TestGDBM < Test::Unit::TestCase def TestGDBM.uname_s require 'rbconfig' - case Config::CONFIG['host_os'] + case RbConfig::CONFIG['host_os'] when 'cygwin' require 'Win32API' uname = Win32API.new('cygwin1', 'uname', 'P', 'I') @@ -21,7 +21,7 @@ if defined? GDBM utsname.unpack('A20' * 5)[0] else - Config::CONFIG['host_os'] + RbConfig::CONFIG['host_os'] end end SYSTEM = uname_s diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index cf7f6e988..bbcab83d0 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -20,8 +20,8 @@ module EnvUtil begin require "rbconfig" File.join( - Config::CONFIG["bindir"], - Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] + RbConfig::CONFIG["bindir"], + RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"] ) rescue LoadError "ruby" diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb index d28830629..dc701978c 100644 --- a/test/soap/calc/test_calc_cgi.rb +++ b/test/soap/calc/test_calc_cgi.rb @@ -12,8 +12,8 @@ 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"] + RbConfig::CONFIG["bindir"], + RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"] ) RUBYBIN << " -d" if $DEBUG diff --git a/test/soap/header/test_authheader_cgi.rb b/test/soap/header/test_authheader_cgi.rb index d70b022ad..8d41837f5 100644 --- a/test/soap/header/test_authheader_cgi.rb +++ b/test/soap/header/test_authheader_cgi.rb @@ -14,8 +14,8 @@ module Header class TestAuthHeaderCGI < 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"] + RbConfig::CONFIG["bindir"], + RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"] ) RUBYBIN << " -d" if $DEBUG diff --git a/test/soap/ssl/test_ssl.rb b/test/soap/ssl/test_ssl.rb index f0a1e1897..772b77c94 100644 --- a/test/soap/ssl/test_ssl.rb +++ b/test/soap/ssl/test_ssl.rb @@ -16,8 +16,8 @@ class TestSSL < Test::Unit::TestCase DIR = File.dirname(File.expand_path(__FILE__)) require 'rbconfig' RUBY = File.join( - Config::CONFIG["bindir"], - Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] + RbConfig::CONFIG["bindir"], + RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"] ) def setup |
