Don't pass $extra_options to CLEAN

nikic · nikic · commit 4dc362bc7527 · 2021-09-06T16:18:18.000+02:00
diff --git a/run-tests.php b/run-tests.php
@@ -2504,7 +2504,7 @@ function run_test(string $php, $file, array $env): string
         if (!$no_clean) {
             $extra = !IS_WINDOWS ?
                 "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;" : "";
-            $clean_output = system_with_timeout("$extra $orig_php $pass_options $extra_options -q $orig_ini_settings $no_file_cache \"$test_clean\"", $env);
+            $clean_output = system_with_timeout("$extra $orig_php $pass_options -q $orig_ini_settings $no_file_cache \"$test_clean\"", $env);
         }
 
         if (!$cfg['keep']['clean']) {

Original file line number	Diff line number	Diff line change
`@@ -2504,7 +2504,7 @@ function run_test(string $php, $file, array $env): string`
`2504`	`2504`	`if (!$no_clean) {`
`2505`	`2505`	`$extra = !IS_WINDOWS ?`
`2506`	`2506`	`"unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;" : "";`
`2507`		`- $clean_output = system_with_timeout("$extra $orig_php $pass_options $extra_options -q $orig_ini_settings $no_file_cache \"$test_clean\"", $env);`
	`2507`	`+ $clean_output = system_with_timeout("$extra $orig_php $pass_options -q $orig_ini_settings $no_file_cache \"$test_clean\"", $env);`
`2508`	`2508`	`}`
`2509`	`2509`
`2510`	`2510`	`if (!$cfg['keep']['clean']) {`