naruse	2009-09-13 02:00:51 +0900 (Sun, 13 Sep 2009)

  New Revision: 24878

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

  Log:
    * test: use require_relative.

  Modified files:
    trunk/test/drb/drbtest.rb
    trunk/test/openssl/test_pair.rb
    trunk/test/openssl/test_ssl.rb
    trunk/test/rubygems/test_kernel.rb
    trunk/test/stringio/test_stringio.rb
    trunk/test/test_syslog.rb
    trunk/test/webrick/utils.rb

Index: test/openssl/test_pair.rb
===================================================================
--- test/openssl/test_pair.rb	(revision 24877)
+++ test/openssl/test_pair.rb	(revision 24878)
@@ -7,10 +7,7 @@
 if defined?(OpenSSL)
 
 require 'socket'
-dir = File.expand_path(__FILE__)
-2.times {dir = File.dirname(dir)}
-$:.replace([File.join(dir, "ruby")] | $:)
-require 'ut_eof'
+require_relative '../ruby/ut_eof'
 
 module SSLPair
   def server
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 24877)
+++ test/openssl/test_ssl.rb	(revision 24878)
@@ -1,18 +1,12 @@
 begin
   require "openssl"
-  require File.join(File.dirname(__FILE__), "utils.rb")
+  require_relative "utils.rb"
 rescue LoadError
 end
 require "rbconfig"
 require "socket"
 require "test/unit"
-begin
-  loadpath = $:.dup
-  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
-  require 'envutil'
-ensure
-  $:.replace(loadpath)
-end
+require_relative '../ruby/envutil'
 
 if defined?(OpenSSL)
 
Index: test/webrick/utils.rb
===================================================================
--- test/webrick/utils.rb	(revision 24877)
+++ test/webrick/utils.rb	(revision 24878)
@@ -1,10 +1,4 @@
-begin
-  loadpath = $:.dup
-  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
-  require 'envutil'
-ensure
-  $:.replace(loadpath)
-end
+require_relative '../ruby/envutil'
 require "webrick"
 begin
   require "webrick/https"
Index: test/rubygems/test_kernel.rb
===================================================================
--- test/rubygems/test_kernel.rb	(revision 24877)
+++ test/rubygems/test_kernel.rb	(revision 24878)
@@ -4,7 +4,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require_relative 'gemutilities'
 require 'rubygems/package'
 
 class TestKernel < RubyGemTestCase
Index: test/test_syslog.rb
===================================================================
--- test/test_syslog.rb	(revision 24877)
+++ test/test_syslog.rb	(revision 24878)
@@ -6,10 +6,6 @@
 # If in doubt, ask your admin.
 
 require 'test/unit'
-
-# Prepend current directory to load path for testing.
-$:.unshift('.')
-
 require 'syslog'
 
 class TestSyslog < Test::Unit::TestCase
Index: test/stringio/test_stringio.rb
===================================================================
--- test/stringio/test_stringio.rb	(revision 24877)
+++ test/stringio/test_stringio.rb	(revision 24878)
@@ -1,9 +1,6 @@
 require 'test/unit'
 require 'stringio'
-dir = File.expand_path(__FILE__)
-2.times {dir = File.dirname(dir)}
-$:.replace([File.join(dir, "ruby")] | $:)
-require 'ut_eof'
+require_relative '../ruby/ut_eof'
 
 class TestStringIO < Test::Unit::TestCase
   include TestEOF
Index: test/drb/drbtest.rb
===================================================================
--- test/drb/drbtest.rb	(revision 24877)
+++ test/drb/drbtest.rb	(revision 24878)
@@ -2,13 +2,7 @@
 require 'drb/drb'
 require 'drb/extservm'
 require 'timeout'
-begin
-  loadpath = $:.dup
-  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
-  require 'envutil'
-ensure
-  $:.replace(loadpath)
-end
+require_relative '../ruby/envutil'
 
 class DRbService
   @@manager = DRb::ExtServManager.new

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