summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-27 02:27:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-27 02:27:53 +0000
commit2d8b8b4d3eee567237c4be24b615be65f9b98235 (patch)
tree9627717df569a5f5a910989778580ff9562deabc
parenta000c52b83e73d6ea40b5ab72eef9d2c88842a1a (diff)
fix operator precedence
* lib/test/unit.rb (Test::Unit::Runner#_prepare_run): fix operator precedence, so that platform and TERM should be counted. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/test/unit.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 03bc6072d83..27efff5d33f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 27 11:27:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit.rb (Test::Unit::Runner#_prepare_run): fix operator
+ precedence, so that platform and TERM should be counted.
+
Sun May 27 10:02:33 2012 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_strftime.c: allows %Ok and %Ol.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index b48f49815ba..3048adefac6 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -671,7 +671,7 @@ module Test
when :always
color = true
when :auto, nil
- color = @options[:job_status] == :replace and /mswin|mingw/ !~ RUBY_PLATFORM and /dumb/ !~ ENV["TERM"]
+ color = @options[:job_status] == :replace && /mswin|mingw/ !~ RUBY_PLATFORM && /dumb/ !~ ENV["TERM"]
else
color = false
end