summaryrefslogtreecommitdiff
path: root/test/testunit
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-17 06:26:51 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-17 06:26:51 +0000
commitf8c6a5dc02439bb99c8403602288c2937b9356cc (patch)
tree263e3a008f86de66e7d93f5aa4be8b708cc20020 /test/testunit
parentc466dcc05bd9b95717dba424be9535e2e75822bc (diff)
* 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
Diffstat (limited to 'test/testunit')
-rw-r--r--test/testunit/test4test_hideskip.rb2
-rw-r--r--test/testunit/test4test_redefinition.rb2
-rw-r--r--test/testunit/test4test_sorting.rb2
-rw-r--r--test/testunit/test_parallel.rb3
-rw-r--r--test/testunit/test_rake_integration.rb1
-rw-r--r--test/testunit/tests_for_parallel/runner.rb3
6 files changed, 11 insertions, 2 deletions
diff --git a/test/testunit/test4test_hideskip.rb b/test/testunit/test4test_hideskip.rb
index 485b1bc..7dba6f5 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 72c4cb2..77cfd45 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 1f7f4a3..b8bb943 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 6276aac..a36a272 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 86a0cf8..0770404 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 261880a..e262e1e 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__))