summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-08 00:25:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-08 00:25:43 +0000
commit1af101f8edd4d0990fe275c11ffd282132055a81 (patch)
tree991daf969313738802817fb7ee80d7e504b2fdc9
parent79f28211fdf79759de17cd1c45ddeed460c0b0da (diff)
lib/test/unit.rb: old behavior if verbose
* lib/test/unit.rb (Test::Unit::Runner#_prepare_run): keep the old behavior if --verbose option is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/test/unit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 518ce04..b118ec1 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -660,8 +660,8 @@ module Test
end
def _prepare_run(suites, type)
- if @tty
- @verbose ||= !options[:parallel]
+ if @tty and !@verbose
+ @verbose = !options[:parallel]
@output = StatusLineOutput.new(self)
end
if /\A\/(.*)\/\z/ =~ (filter = options[:filter])