nobu	2010-01-12 16:41:40 +0900 (Tue, 12 Jan 2010)

  New Revision: 26299

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26299

  Log:
    * test/ruby/envutil.rb (EnvUtil#rubybin): fake also rbconfig.

  Modified files:
    branches/ruby_1_8/test/ruby/envutil.rb
    branches/ruby_1_8/test/webrick/test_filehandler.rb
    trunk/test/ruby/envutil.rb
    trunk/test/webrick/test_filehandler.rb

Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 26298)
+++ test/ruby/envutil.rb	(revision 26299)
@@ -20,10 +20,9 @@
       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 @@
   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
Index: test/webrick/test_filehandler.rb
===================================================================
--- test/webrick/test_filehandler.rb	(revision 26298)
+++ test/webrick/test_filehandler.rb	(revision 26299)
@@ -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)
Index: ruby_1_8/test/ruby/envutil.rb
===================================================================
--- ruby_1_8/test/ruby/envutil.rb	(revision 26298)
+++ ruby_1_8/test/ruby/envutil.rb	(revision 26299)
@@ -15,15 +15,32 @@
       end
       ruby = File.join("..", ruby)
     end
-    begin
-      require "rbconfig"
+    if defined?(RbConfig.ruby)
       File.join(
         Config::CONFIG["bindir"],
 	Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
-      )
-    rescue LoadError
+                )
+    else
       "ruby"
     end
   end
   module_function :rubybin
 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
Index: ruby_1_8/test/webrick/test_filehandler.rb
===================================================================
--- ruby_1_8/test/webrick/test_filehandler.rb	(revision 26298)
+++ ruby_1_8/test/webrick/test_filehandler.rb	(revision 26299)
@@ -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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/