Skip to content

Commit 0caebcd

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: Fix run-tests.php -s flag
2 parents 6989f51 + ca9305e commit 0caebcd

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

run-tests.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,8 @@ function main(): void
701701
write_information($user_tests, $phpdbg);
702702

703703
if ($test_cnt) {
704-
putenv('NO_INTERACTION=1');
704+
$exts_tested = [];
705+
$exts_skipped = [];
705706
usort($test_files, "test_sort");
706707
$start_time = hrtime(true);
707708

@@ -780,7 +781,7 @@ function main(): void
780781
show_end($start_timestamp, $start_time, $end_time);
781782
show_summary();
782783

783-
save_results($output_file, /* prompt_to_save_results: */ true);
784+
save_results($output_file, /* prompt_to_save_results: */ !$just_save_results);
784785
}
785786

786787
$junit->saveXML();
@@ -906,7 +907,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
906907
{
907908
global $sum_results, $failed_test_summary, $PHP_FAILED_TESTS, $php;
908909

909-
if (getenv('NO_INTERACTION')) {
910+
if (getenv('NO_INTERACTION') && $prompt_to_save_results) {
910911
return;
911912
}
912913

0 commit comments

Comments
 (0)