From 5f234fd624483632702dd93acc6fd7e3dfca3598 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Fri, 31 Jul 2020 19:02:59 +0100
Subject: [PATCH 1/2] Add colours to test results in run-tests.php

The test runner will attempt to colourise the result of each test

The --no-color option is introduced to disable this feature.
---
 run-tests.php | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/run-tests.php b/run-tests.php
index a575f93cd4d5b..40b0cc7c7ed58 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -114,6 +114,8 @@ function show_usage(): void
 
     --no-clean  Do not execute clean section if any.
 
+    --no-color Do not colorize the result type in the test result
+
 
 HELP;
 }
@@ -133,7 +135,7 @@ function main(): void
     global $DETAILED, $PHP_FAILED_TESTS, $SHOW_ONLY_GROUPS, $argc, $argv, $cfg,
            $cfgfiles, $cfgtypes, $conf_passed, $end_time, $environment,
            $exts_skipped, $exts_tested, $exts_to_test, $failed_tests_file,
-           $ignored_by_ext, $ini_overwrites, $is_switch,
+           $ignored_by_ext, $ini_overwrites, $is_switch, $colorize,
            $just_save_results, $log_format, $matches, $no_clean, $no_file_cache,
            $optionals, $output_file, $pass_option_n, $pass_options,
            $pattern_match, $php, $php_cgi, $phpdbg, $preload, $redir_tests,
@@ -384,6 +386,10 @@ function main(): void
     $temp_urlbase = null;
     $conf_passed = null;
     $no_clean = false;
+    $colorize = true;
+    if (function_exists('sapi_windows_vt100_support') && !sapi_windows_vt100_support(STDOUT, true)) {
+        $colorize = false;
+    }
     $selected_tests = false;
     $slow_min_ms = INF;
     $preload = false;
@@ -530,6 +536,9 @@ function main(): void
                 case '--no-clean':
                     $no_clean = true;
                     break;
+                case '--no-color':
+                    $colorize = false;
+                    break;
                 case 'p':
                     $php = $argv[++$i];
                     putenv("TEST_PHP_EXECUTABLE=$php");
@@ -3266,10 +3275,30 @@ function show_result(
     string $extra = '',
     ?array $temp_filenames = null
 ): void {
-    global $temp_target, $temp_urlbase, $line_length, $SHOW_ONLY_GROUPS;
+    global $SHOW_ONLY_GROUPS, $colorize;
 
     if (!$SHOW_ONLY_GROUPS || in_array($result, $SHOW_ONLY_GROUPS)) {
-        echo "$result $tested [$tested_file] $extra\n";
+        if ($colorize) {
+            /* Use ANSI escape codes for coloring test result */
+            switch ( $result ) {
+                case 'PASS': // Light Green
+                    $color = "\e[1;32m{$result}\e[0m"; break;
+                case 'SKIP': // Light Gray
+                    $color = "\e[0;37m{$result}\e[0m"; break;
+                case 'FAIL': // Light Red
+                    $color = "\e[1;31m{$result}\e[0m"; break;
+                case 'BORK': // Purple
+                    $color = "\e[0;35m{$result}\e[0m"; break;
+                case 'LEAK': // Dark Blue
+                    $color = "\e[2;34m{$result}\e[0m"; break;
+                default: // Yellow
+                    $color = "\e[1;33m{$result}\e[0m"; break;
+            }
+
+            echo "$color $tested [$tested_file] $extra\e[0m\n";
+        } else {
+            echo "$result $tested [$tested_file] $extra\n";
+        }
     } elseif (!$SHOW_ONLY_GROUPS) {
         clear_show_test();
     }

From b75bd3160bd53e9c3852eb0897226c37a5446ebc Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Fri, 7 Aug 2020 11:57:51 +0200
Subject: [PATCH 2/2] Reviews

---
 run-tests.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/run-tests.php b/run-tests.php
index 40b0cc7c7ed58..5839c7e90f76c 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -3283,19 +3283,16 @@ function show_result(
             switch ( $result ) {
                 case 'PASS': // Light Green
                     $color = "\e[1;32m{$result}\e[0m"; break;
-                case 'SKIP': // Light Gray
-                    $color = "\e[0;37m{$result}\e[0m"; break;
-                case 'FAIL': // Light Red
+                case 'FAIL':
+                case 'BORK':
+                case 'LEAK':
+                    // Light Red
                     $color = "\e[1;31m{$result}\e[0m"; break;
-                case 'BORK': // Purple
-                    $color = "\e[0;35m{$result}\e[0m"; break;
-                case 'LEAK': // Dark Blue
-                    $color = "\e[2;34m{$result}\e[0m"; break;
                 default: // Yellow
                     $color = "\e[1;33m{$result}\e[0m"; break;
             }
 
-            echo "$color $tested [$tested_file] $extra\e[0m\n";
+            echo "$color $tested [$tested_file] $extra\n";
         } else {
             echo "$result $tested [$tested_file] $extra\n";
         }