* test/runner.rb: remove dependency test-unit and minitest

  from stdlib when running with test-all.
  [Feature #9711][ruby-core:61890]
* test/testunit/*.rb: ditto.
* test/lib: ditto.

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

6 files changed, 11 insertions, 2 deletions

diff --git a/test/testunit/test4test_hideskip.rb b/test/testunit/test4test_hideskip.rb
index 485b1bc1f2..7dba6f57b4 100644
--- a/test/testunit/test4test_hideskip.rb
+++ b/test/testunit/test4test_hideskip.rb
@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+
 require 'test/unit'
 
 class TestForTestHideSkip < Test::Unit::TestCase
diff --git a/test/testunit/test4test_redefinition.rb b/test/testunit/test4test_redefinition.rb
index 72c4cb225a..77cfd45015 100644
--- a/test/testunit/test4test_redefinition.rb
+++ b/test/testunit/test4test_redefinition.rb
@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+
 require 'test/unit'
 
 class TestForTestRedefinition < Test::Unit::TestCase
diff --git a/test/testunit/test4test_sorting.rb b/test/testunit/test4test_sorting.rb
index 1f7f4a323e..b8bb9430b5 100644
--- a/test/testunit/test4test_sorting.rb
+++ b/test/testunit/test4test_sorting.rb
@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+
 require 'test/unit'
 
 class TestForTestHideSkip < Test::Unit::TestCase
diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb
index 6276aac8bd..a36a2729f3 100644
--- a/test/testunit/test_parallel.rb
+++ b/test/testunit/test_parallel.rb
@@ -2,10 +2,9 @@ require 'test/unit'
 require 'timeout'
 
 module TestParallel
-  PARALLEL_RB = "#{File.dirname(__FILE__)}/../../lib/test/unit/parallel.rb"
+  PARALLEL_RB = "#{File.dirname(__FILE__)}/../lib/test/unit/parallel.rb"
   TESTS = "#{File.dirname(__FILE__)}/tests_for_parallel"
 
-
   class TestParallelWorker < Test::Unit::TestCase
     def setup
       i, @worker_in = IO.pipe
diff --git a/test/testunit/test_rake_integration.rb b/test/testunit/test_rake_integration.rb
index 86a0cf8829..0770404287 100644
--- a/test/testunit/test_rake_integration.rb
+++ b/test/testunit/test_rake_integration.rb
@@ -18,6 +18,7 @@ class RakeIntegration < MiniTest::Unit::TestCase
       filename = File.join dir, 'testing.rb'
       File.open(filename, 'wb') do |f|
         f.write <<-eotest
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'test/unit'
 raise 'loaded twice' if defined?(FooTest)
 class FooTest; end
diff --git a/test/testunit/tests_for_parallel/runner.rb b/test/testunit/tests_for_parallel/runner.rb
index 261880ad2b..e262e1e6c7 100644
--- a/test/testunit/tests_for_parallel/runner.rb
+++ b/test/testunit/tests_for_parallel/runner.rb
@@ -1,4 +1,7 @@
 require 'rbconfig'
+
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
+
 require 'test/unit'
 
 src_testdir = File.dirname(File.expand_path(__FILE__))