1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Fix run-tests.php -s flag
This commit is contained in:
Ilija Tovilo
2026-01-19 14:39:13 +01:00

View File

@@ -701,7 +701,8 @@ function main(): void
write_information($user_tests, $phpdbg);
if ($test_cnt) {
putenv('NO_INTERACTION=1');
$exts_tested = [];
$exts_skipped = [];
usort($test_files, "test_sort");
$start_time = hrtime(true);
@@ -780,7 +781,7 @@ function main(): void
show_end($start_timestamp, $start_time, $end_time);
show_summary();
save_results($output_file, /* prompt_to_save_results: */ true);
save_results($output_file, /* prompt_to_save_results: */ !$just_save_results);
}
$junit->saveXML();
@@ -906,7 +907,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
{
global $sum_results, $failed_test_summary, $PHP_FAILED_TESTS, $php;
if (getenv('NO_INTERACTION')) {
if (getenv('NO_INTERACTION') && $prompt_to_save_results) {
return;
}