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  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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'