summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-19 01:12:02 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-19 01:12:02 +0000
commit4c438fd0febce6557ebd38b363451eeab0914d58 (patch)
tree53786eee02e2557c3fb487a79f5a5abbc4c70c48
parent12efda14eb54ab382f521515179e3939ccf77839 (diff)
* lib/test/unit/parallel.rb: Override Test::Unit::TestCase#on_parallel_worker?
only when $0 == __FILE__. * lib/test/unit/parallel.rb: Run Test::Unit::Worker.run only when $0 == __FILE__. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--lib/test/unit/parallel.rb20
2 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a4154507a..ea8f937ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jun 19 10:05:16 2011 Shota Fukumori <sorah@tubusu.net>
+
+ * lib/test/unit/parallel.rb: Override Test::Unit::TestCase#on_parallel_worker?
+ only when $0 == __FILE__.
+
+ * lib/test/unit/parallel.rb: Run Test::Unit::Worker.run only when
+ $0 == __FILE__.
+
Sat Jun 18 23:59:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (fill_cbuf): finish reading at EOF, and the readconv has
diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb
index ab9e864509..7a7c73d4f2 100644
--- a/lib/test/unit/parallel.rb
+++ b/lib/test/unit/parallel.rb
@@ -2,12 +2,6 @@ require 'test/unit'
module Test
module Unit
- class TestCase < MiniTest::Unit::TestCase
- def on_parallel_worker?
- true
- end
- end
-
class Worker < Runner
class << self
undef autorun
@@ -148,4 +142,16 @@ module Test
end
end
-Test::Unit::Worker.new.run(ARGV)
+if $0 == __FILE__
+ module Test
+ module Unit
+ class TestCase < MiniTest::Unit::TestCase
+ def on_parallel_worker?
+ true
+ end
+ end
+ end
+ end
+
+ Test::Unit::Worker.new.run(ARGV)
+end