From a9ca74cd70bfee429544a7346749abcb2103e0f3 Mon Sep 17 00:00:00 2001 From: nobu 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 --- test/lib/test/unit.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'test/lib/test') diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb index 996134eaf3..9d9ff4bdf3 100644 --- a/test/lib/test/unit.rb +++ b/test/lib/test/unit.rb @@ -596,7 +596,13 @@ 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+)=([^:\n]*)/)] : {} + begin + File.read(File.join(__dir__, "../../colors")).scan(/(\w+)=([^:\n]*)/) do |n, c| + colors[n] ||= c + end + rescue + end @passed_color = "\e[;#{colors["pass"] || "32"}m" @failed_color = "\e[;#{colors["fail"] || "31"}m" @skipped_color = "\e[;#{colors["skip"] || "33"}m" -- cgit v1.2.3