summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-30 01:29:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-30 01:29:08 +0000
commit7d303b2d10febdeafde9f70c1e8e54e91c54f42b (patch)
tree5d1f301602f8e54001e9c45f9cfbf534920062b2
parent2f76e6d34c899d81f5c42e3b1e481c9e506a937a (diff)
lib/test/unit.rb: split platform condition
* lib/test/unit.rb (Test::Unit::Runner#_prepare_run): split platform condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/test/unit.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index c44fbf8688b..c64d9b488d0 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -671,7 +671,8 @@ module Test
when :always
color = true
when :auto, nil
- color = @options[:job_status] == :replace && /mswin|mingw/ !~ RUBY_PLATFORM && /dumb/ !~ ENV["TERM"]
+ color = @options[:job_status] == :replace && /dumb/ !~ ENV["TERM"]
+ color &&= /mswin|mingw/ !~ RUBY_PLATFORM
else
color = false
end