Skip to content

Commit 5f4a184

Browse files
committed
Fix run-tests.php -s flag
- Remove unnedded putenv('NO_INTERACTION=1') when executing individual tests. - Fix undefined variable errors when executing individual tests. - Fix -s when NO_INTERACTION=1 is set, given we don't need to prompt anyway. Fixes GH-20961
1 parent c4084bb commit 5f4a184

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
@@ -697,7 +697,8 @@ function main(): void
697697
write_information($user_tests, $phpdbg);
698698

699699
if ($test_cnt) {
700-
putenv('NO_INTERACTION=1');
700+
$exts_tested = [];
701+
$exts_skipped = [];
701702
usort($test_files, "test_sort");
702703
$start_timestamp = time();
703704
$start_time = hrtime(true);
@@ -777,7 +778,7 @@ function main(): void
777778
show_end($start_timestamp, $start_time, $end_time);
778779
show_summary();
779780

780-
save_results($output_file, /* prompt_to_save_results: */ true);
781+
save_results($output_file, /* prompt_to_save_results: */ !$just_save_results);
781782
}
782783

783784
$junit->saveXML();
@@ -920,7 +921,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
920921
{
921922
global $sum_results, $failed_test_summary, $PHP_FAILED_TESTS, $php;
922923

923-
if (getenv('NO_INTERACTION')) {
924+
if (getenv('NO_INTERACTION') && $prompt_to_save_results) {
924925
return;
925926
}
926927

0 commit comments

Comments
 (0)