diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-29 13:33:32 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-29 13:33:32 +0200 |
commit | daaaf2b4ff7929ae9cfea85583535980c0a93d7a (patch) | |
tree | 8e4fc6e4bcc8459fb8785e0e8ca33ffd77c9b762 /run-tests.php | |
parent | acee66ae8c62b02816acc5f31b55cbc6a848a4bc (diff) | |
parent | 9a98569efea4e02ee2e52b168610da8f7a3e9a0c (diff) | |
download | php-git-daaaf2b4ff7929ae9cfea85583535980c0a93d7a.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Pass worker ID to clean scripts
Diffstat (limited to 'run-tests.php')
-rwxr-xr-x | run-tests.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/run-tests.php b/run-tests.php index 93d84cc73f..1432cf1736 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2492,12 +2492,9 @@ COMMAND $cmd 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 = !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); + $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"; } |