* test/lib/envutil.rb: Moved from test/ruby/.

* test/lib/find_executable.rb: Ditto.

* test/lib/memory_status.rb: Ditto.

* test/lib/test/unit.rb: require envutil.

* test/: Don't require envutil in test files.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

11 files changed, 0 insertions, 11 deletions

diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb
index f36f7a08ff..6ac5b8f995 100644
--- a/test/-ext-/bug_reporter/test_bug_reporter.rb
+++ b/test/-ext-/bug_reporter/test_bug_reporter.rb
@@ -1,6 +1,5 @@
 require 'test/unit'
 require 'tmpdir'
-require_relative "../../ruby/envutil"
 
 class TestBugReporter < Test::Unit::TestCase
   def test_bug_reporter_add
diff --git a/test/-ext-/exception/test_data_error.rb b/test/-ext-/exception/test_data_error.rb
index 140de5bd5a..53cbb28438 100644
--- a/test/-ext-/exception/test_data_error.rb
+++ b/test/-ext-/exception/test_data_error.rb
@@ -1,5 +1,4 @@
 require 'test/unit'
-require_relative '../../ruby/envutil'
 
 module Bug
   class TestException < Test::Unit::TestCase
diff --git a/test/-ext-/exception/test_ensured.rb b/test/-ext-/exception/test_ensured.rb
index 103250c678..97d9794186 100644
--- a/test/-ext-/exception/test_ensured.rb
+++ b/test/-ext-/exception/test_ensured.rb
@@ -1,5 +1,4 @@
 require 'test/unit'
-require_relative '../../ruby/envutil'
 
 module Bug
   class Bug7802 < RuntimeError
diff --git a/test/-ext-/marshal/test_usrmarshal.rb b/test/-ext-/marshal/test_usrmarshal.rb
index ae23223e15..8d8db012ac 100644
--- a/test/-ext-/marshal/test_usrmarshal.rb
+++ b/test/-ext-/marshal/test_usrmarshal.rb
@@ -1,5 +1,4 @@
 require 'test/unit'
-require_relative '../../ruby/envutil'
 require '-test-/marshal/usr'
 
 module Bug end
diff --git a/test/-ext-/string/test_modify_expand.rb b/test/-ext-/string/test_modify_expand.rb
index 1d20db4e6c..34b7be7bba 100644
--- a/test/-ext-/string/test_modify_expand.rb
+++ b/test/-ext-/string/test_modify_expand.rb
@@ -1,6 +1,5 @@
 require 'test/unit'
 require "-test-/string/string"
-require_relative '../../ruby/envutil'
 
 class Test_StringModifyExpand < Test::Unit::TestCase
   def test_modify_expand_memory_leak
diff --git a/test/-ext-/struct/test_member.rb b/test/-ext-/struct/test_member.rb
index 4e6295c218..18e98085a0 100644
--- a/test/-ext-/struct/test_member.rb
+++ b/test/-ext-/struct/test_member.rb
@@ -1,6 +1,5 @@
 require 'test/unit'
 require "-test-/struct"
-require_relative '../../ruby/envutil'
 
 class  Bug::Struct::Test_Member < Test::Unit::TestCase
   S = Bug::Struct.new(:a)
diff --git a/test/-ext-/test_bug-3571.rb b/test/-ext-/test_bug-3571.rb
index cd43d0330d..d7c26d1ff0 100644
--- a/test/-ext-/test_bug-3571.rb
+++ b/test/-ext-/test_bug-3571.rb
@@ -1,5 +1,4 @@
 require 'test/unit'
-require_relative '../ruby/envutil'
 
 class Test_BUG_3571 < Test::Unit::TestCase
   def test_block_call_id
diff --git a/test/-ext-/test_recursion.rb b/test/-ext-/test_recursion.rb
index 43a256f942..06faf6dc7a 100644
--- a/test/-ext-/test_recursion.rb
+++ b/test/-ext-/test_recursion.rb
@@ -1,6 +1,5 @@
 # -*- coding: us-ascii -*-
 require 'test/unit'
-require_relative '../ruby/envutil'
 
 class TestRecursion < Test::Unit::TestCase
   require '-test-/recursion'
diff --git a/test/-ext-/tracepoint/test_tracepoint.rb b/test/-ext-/tracepoint/test_tracepoint.rb
index cc630e895b..b5a6e769d6 100644
--- a/test/-ext-/tracepoint/test_tracepoint.rb
+++ b/test/-ext-/tracepoint/test_tracepoint.rb
@@ -1,6 +1,5 @@
 require 'test/unit'
 require '-test-/tracepoint'
-require_relative '../../ruby/envutil'
 
 class TestTracepointObj < Test::Unit::TestCase
   def test_not_available_from_ruby
diff --git a/test/-ext-/win32/test_dln.rb b/test/-ext-/win32/test_dln.rb
index c9065e66fb..2801ebe3c9 100644
--- a/test/-ext-/win32/test_dln.rb
+++ b/test/-ext-/win32/test_dln.rb
@@ -1,7 +1,6 @@
 require 'test/unit'
 require 'tmpdir'
 require 'rbconfig'
-require_relative '../../ruby/envutil'
 
 module Bug
   module Win32
diff --git a/test/-ext-/win32/test_fd_setsize.rb b/test/-ext-/win32/test_fd_setsize.rb
index 0881971969..6fe889c941 100644
--- a/test/-ext-/win32/test_fd_setsize.rb
+++ b/test/-ext-/win32/test_fd_setsize.rb
@@ -1,5 +1,4 @@
 require 'test/unit'
-require_relative '../../ruby/envutil'
 
 module Bug
   module Win32