diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-29 11:12:03 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-29 13:30:28 +0200 |
| commit | 9a98569efea4e02ee2e52b168610da8f7a3e9a0c (patch) | |
| tree | 1527a92549566b8bc4657b845712def637b242dc /run-tests.php | |
| parent | 5d3b7ac92c5e7870eb83a39a1b50617c85ea8974 (diff) | |
| download | php-git-9a98569efea4e02ee2e52b168610da8f7a3e9a0c.tar.gz | |
Pass worker ID to clean scripts
On Windows, reusing/sharing of OPcache instances with different
configuration is not necessarily supported, so we have to make that it
does not happen for the clean scripts, by using `$orig_ini_settings`
instead of `$clean_params`.
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 e632f69a82..5a6ac531fc 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2473,12 +2473,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 = substr(PHP_OS, 0, 3) !== "WIN" ? "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;" : ""; - 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); } if (!$cfg['keep']['clean']) { |