aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-15 22:27:11 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-15 22:27:11 +0000
commit6e125382d7af727f70063a8f5e5959744865c193 (patch)
tree1546ac4591efecee79188d7eff79a5e8af5841dd
parent72e8077957c252ff3f97afb1229c0553f1a82d0b (diff)
downloadruby-6e125382d7af727f70063a8f5e5959744865c193.tar.gz
* lib/test/unit.rb(Test::Unit::Runner#_run_parallel): Ignore -j0
because it makes blocking forever by IO.select. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/test/unit.rb5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f7d430836..cd39222667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 16 07:20:06 2011 Shota Fukumori <sorah@tubusu.net>
+
+ * lib/test/unit.rb(Test::Unit::Runner#_run_parallel): Ignore -j0
+ because it makes blocking forever by IO.select.
+
Thu Jun 16 03:08:11 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* test/testunit/test_parallel.rb (TestParallel::TestParallelWorker#
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 72d403417f..af67a7aabd 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -388,6 +388,11 @@ module Test
end
def _run_parallel suites, type, result
+ if @opts[:parallel] < 1
+ warn "Error: parameter of -j option should be greater than 0."
+ return
+ end
+
begin
# Require needed things for parallel running
require 'thread'