Merge branch 'PHP-7.4'

* PHP-7.4:
  Pass worker ID to clean scripts

diff --cc run-tests.php
index 93d84cc73fdc0292f44030e025594b07460c8ef3,5a6ac531fc38ee407804e9f476214aa44cc5354c..1432cf173649e4bfa56bef6d73c6881bde3bbed0
--- 1/run-tests.php
--- 2/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']) {