summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-21 07:05:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-21 07:05:50 +0000
commit9c14029fce49322fc434bf59bfa99f71a9eb2dec (patch)
treef3e22a2a3d1b4f98b4fe797e2906978ce1c76471
parent51a929c66d84a5a64ed82313ea995dcf3b82e93f (diff)
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
-rw-r--r--lib/test/unit.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index c80564c..b836749 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