Skip to content

Commit f3f44da

Browse files
Fix GH-18404: Always prompt to save test report
1 parent 17826d3 commit f3f44da

File tree

8 files changed

+12
-3
lines changed

8 files changed

+12
-3
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ jobs:
166166
name: Test
167167
no_output_timeout: 30m
168168
command: |
169+
export NO_INTERACTION=1
169170
sapi/cli/php run-tests.php \
170171
-d opcache.enable_cli=1 \
171172
-d opcache.jit_buffer_size=64M \

.github/actions/freebsd/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ runs:
106106
export SKIP_IO_CAPTURE_TESTS=1
107107
export CI_NO_IPV6=1
108108
export STACK_LIMIT_DEFAULTS_CHECK=1
109+
export NO_INTERACTION=1
109110
sapi/cli/php run-tests.php \
110111
-P -q -j2 \
111112
-g FAIL,BORK,LEAK,XLEAK \

.github/actions/test-alpine/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ runs:
1414
set -x
1515
export SKIP_IO_CAPTURE_TESTS=1
1616
export STACK_LIMIT_DEFAULTS_CHECK=1
17+
export NO_INTERACTION=1
1718
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
1819
-d opcache.jit=${{ inputs.jitType }} \
1920
-d opcache.jit_buffer_size=64M \

.github/actions/test-gentoo/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ runs:
2525
# Slow tests criteron is doubled because this runner isn't as fast as others
2626
export SKIP_IO_CAPTURE_TESTS=1
2727
export STACK_LIMIT_DEFAULTS_CHECK=1
28+
export NO_INTERACTION=1
2829
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
2930
-j$(nproc) \
3031
-g FAIL,BORK,LEAK,XLEAK \

.github/actions/test-libmysqlclient/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ runs:
1414
export PDO_MYSQL_TEST_HOST=127.0.0.1
1515
export PDO_MYSQL_TEST_USER=root
1616
export PDO_MYSQL_TEST_PASS=root
17+
export NO_INTERACTION=1
1718
sapi/cli/php run-tests.php -P -q \
1819
-g FAIL,BORK,LEAK,XLEAK \
1920
--no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 \

.github/actions/test-linux/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ runs:
4141
export PDO_ODBC_TEST_DSN="odbc:Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=pdo_odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
4242
export SKIP_IO_CAPTURE_TESTS=1
4343
export STACK_LIMIT_DEFAULTS_CHECK=1
44+
export NO_INTERACTION=1
4445
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
4546
-d opcache.jit=${{ inputs.jitType }} \
4647
-d opcache.protect_memory=1 \

.github/actions/test-macos/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ runs:
1515
export SKIP_IO_CAPTURE_TESTS=1
1616
export CI_NO_IPV6=1
1717
export STACK_LIMIT_DEFAULTS_CHECK=1
18+
export NO_INTERACTION=1
1819
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
1920
-d opcache.jit=${{ inputs.jitType }} \
2021
-d opcache.protect_memory=1 \

run-tests.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,10 @@ function main(): void
691691
verify_config($php);
692692
write_information($user_tests, $phpdbg);
693693

694+
$exts_tested = $exts_to_test;
695+
$exts_skipped = [];
696+
694697
if ($test_cnt) {
695-
putenv('NO_INTERACTION=1');
696698
usort($test_files, "test_sort");
697699
$start_time = hrtime(true);
698700

@@ -721,12 +723,12 @@ function main(): void
721723

722724
if ($output_file != '' && $just_save_results) {
723725
save_results($output_file, /* prompt_to_save_results: */ false);
726+
} else {
727+
save_results($output_file, /* prompt_to_save_results: */ true);
724728
}
725729
} else {
726730
// Compile a list of all test files (*.phpt).
727731
$test_files = [];
728-
$exts_tested = $exts_to_test;
729-
$exts_skipped = [];
730732
sort($exts_to_test);
731733

732734
foreach (['Zend', 'tests', 'ext', 'sapi'] as $dir) {

0 commit comments

Comments
 (0)