From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 29 Apr 2020 11:33:32 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=daaaf2b4ff7929ae9cfea85583535980c0a93d7a;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Pass worker ID to clean scripts
---

daaaf2b4ff7929ae9cfea85583535980c0a93d7a
diff --cc run-tests.php
index 93d84cc73f,5a6ac531fc..1432cf1736
--- a/run-tests.php
+++ b/run-tests.php
@@@ -2492,15 -2473,9 +2492,12 @@@ COMMAND $cm
              save_text($test_clean, trim($section_text['CLEAN']), $temp_clean);
  
              if (!$no_clean) {
-                 $clean_params = array();
-                 settings2array($ini_overwrites, $clean_params);
-                 $clean_params = settings2params($clean_params);
 -                $extra = substr(PHP_OS, 0, 3) !== "WIN" ?
 +                $extra = !IS_WINDOWS ?
                      "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;" : "";
-                 $clean_output = system_with_timeout("$extra $php $pass_options $extra_options -q $clean_params $no_file_cache \"$test_clean\"", $env);
 -                system_with_timeout("$extra $php $pass_options $extra_options -q $orig_ini_settings $no_file_cache \"$test_clean\"", $env);
++                $clean_output = system_with_timeout("$extra $php $pass_options $extra_options -q $orig_ini_settings $no_file_cache \"$test_clean\"", $env);
 +                if (trim($clean_output) != '') {
 +                    echo "\nCLEAN OUTPUT: $file: $clean_output\n";
 +                }
              }
  
              if (!$cfg['keep']['clean']) {