From 9c14029fce49322fc434bf59bfa99f71a9eb2dec Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 21 May 2012 07:05:50 +0000
Subject: lib/test/unit.rb: simple ouput if verbose

* lib/test/unit.rb (Test::Unit::Runner#_prepare_run): use simple
  output if verbose mode and no job-status option given.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/test/unit.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index c80564c3c5..b836749ff4 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -65,7 +65,7 @@ module Test
         opts.version = MiniTest::Unit::VERSION
 
         options[:retry] = true
-        options[:job_status] ||= :replace if @tty
+        options[:job_status] = nil
 
         opts.on '-h', '--help', 'Display this help.' do
           puts opts
@@ -666,6 +666,7 @@ module Test
       end
 
       def _prepare_run(suites, type)
+        options[:job_status] ||= @tty && !options[:verbose] ? :replace : :normal
         case options[:color]
         when :always
           color = true
@@ -681,7 +682,7 @@ module Test
         else
           @failed_color = @reset_color = ""
         end
-        if @options[:job_status] == :replace
+        if color or @options[:job_status] == :replace
           @verbose = !options[:parallel]
           @output = StatusLineOutput.new(self)
         end
-- 
cgit v1.2.3