From 23a7b0f323354785011b9eda4ffdb9fbcab63fe9 Mon Sep 17 00:00:00 2001
From: twosee <twose@qq.com>
Date: Mon, 1 Feb 2021 12:56:59 +0800
Subject: Fix environment variable not work in run-tests.php

Closes GH-6657.
---
 run-tests.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'run-tests.php')

diff --git a/run-tests.php b/run-tests.php
index 613b1391e1..51758ce507 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -340,7 +340,7 @@ function main(): void
     if (function_exists('sapi_windows_vt100_support') && !sapi_windows_vt100_support(STDOUT, true)) {
         $colorize = false;
     }
-    if (array_key_exists('NO_COLOR', $_ENV)) {
+    if (array_key_exists('NO_COLOR', $environment)) {
         $colorize = false;
     }
     $selected_tests = false;
@@ -1446,7 +1446,7 @@ function run_all_tests_parallel(array $test_files, array $env, $redir_tested): v
             [], // Inherit our stdin, stdout and stderr
             $pipes,
             null,
-            $_ENV + [
+            $GLOBALS['environment'] + [
                 "TEST_PHP_WORKER" => $i,
                 "TEST_PHP_URI" => $sockUri,
             ],
-- 
cgit v1.2.1