summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-15 01:38:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-15 01:38:32 +0000
commit19b4b7de3b82466eb99b4027430cdf88718610a0 (patch)
treec20f10e75b305e9141414619919738d1c19e8011
parentfa6a2e03248840f4cb2308457abfd58e1244327b (diff)
test: TEST_COLORS
* bootstraptest/runner.rb (main): fixed typo. * lib/test/unit.rb (Test::Unit::Runner#_prepare_run): ditto. * sample/test.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xbootstraptest/runner.rb2
-rw-r--r--lib/test/unit.rb2
-rwxr-xr-xsample/test.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index c36c5a2dd9..40faa04234 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -128,7 +128,7 @@ End
end
if @color
# dircolors-like style
- colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w)=([^:]*)/)] : {}
+ colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
@passed = "\e[#{colors["pass"] || "32"}m"
@failed = "\e[#{colors["fail"] || "31"}m"
@reset = "\e[m"
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index ff489d67b9..7b3554cbed 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -677,7 +677,7 @@ module Test
end
if color
# dircolors-like style
- colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w)=([^:]*)/)] : {}
+ colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
@passed_color = "\e[#{colors["pass"] || "32"}m"
@failed_color = "\e[#{colors["fail"] || "31"}m"
@skipped_color = "\e[#{colors["skip"] || "33"}m"
diff --git a/sample/test.rb b/sample/test.rb
index ee8bc4a6bc..dcb4cdf24b 100755
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -24,7 +24,7 @@ PROGRESS.instance_eval do
end
if @color
# dircolors-like style
- colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w)=([^:]*)/)] : {}
+ colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
@passed = "\e[#{colors["pass"] || "32"}m"
@failed = "\e[#{colors["fail"] || "31"}m"
@reset = "\e[m"