use require_relative to require ut_eof and envutil.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 8 insertions, 5 deletions

diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb
index 21b9b4c33..2f6a5437f 100644
--- a/test/ruby/test_beginendblock.rb
+++ b/test/ruby/test_beginendblock.rb
@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'tempfile'
-$:.replace([File.dirname(File.expand_path(__FILE__))] | $:)
-require 'envutil'
+require 'require_relative'
+require_relative 'envutil'
 
 class TestBeginEndBlock < Test::Unit::TestCase
   DIR = File.dirname(File.expand_path(__FILE__))
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 911957579..62e1c6341 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'tempfile'
-require 'ut_eof'
+require 'require_relative'
+require_relative 'ut_eof'
 
 class TestFile < Test::Unit::TestCase
 
diff --git a/test/ruby/test_pipe.rb b/test/ruby/test_pipe.rb
index 73c7965e8..3b47bdee5 100644
--- a/test/ruby/test_pipe.rb
+++ b/test/ruby/test_pipe.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
-require 'ut_eof'
+require 'require_relative'
+require_relative 'ut_eof'
 
 class TestPipe < Test::Unit::TestCase
   include TestEOF
diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb
index 403bacab2..9a897027b 100644
--- a/test/ruby/test_system.rb
+++ b/test/ruby/test_system.rb
@@ -1,6 +1,7 @@
 require 'test/unit'
-require 'envutil'
 require 'tmpdir'
+require 'require_relative'
+require_relative 'envutil'
 
 class TestSystem < Test::Unit::TestCase
   def valid_syntax?(code, fname)