From ba42dd2b3241b50292ef1a952490209f13a6ec36 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 17 May 2015 00:50:11 +0000
Subject: default colors

* bootstraptest/runner.rb, sample/test.rb, test/lib/test/unit.rb:
  shared the default colors from test/colors file.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 sample/test.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'sample/test.rb')

diff --git a/sample/test.rb b/sample/test.rb
index 85a11e0d4d..14f4d4a0f1 100755
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -33,7 +33,13 @@ class Progress
     end
     if @color
       # dircolors-like style
-      colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
+      colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
+      begin
+        File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c|
+          colors[n] ||= c
+        end
+      rescue
+      end
       @passed = "\e[;#{colors["pass"] || "32"}m"
       @failed = "\e[;#{colors["fail"] || "31"}m"
       @reset = "\e[m"
-- 
cgit v1.2.3