Skip to content

Commit c4d960e

Browse files
committed
Remove unused $temp_filenames parameter from run-tests' show_result()
1 parent d15431e commit c4d960e

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

run-tests.php

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,9 +2118,9 @@ function run_test(string $php, $file, array $env): string
21182118

21192119
if (!strncasecmp('skip', $output, 4)) {
21202120
if (preg_match('/^skip\s*(.+)/i', $output, $m)) {
2121-
show_result('SKIP', $tested, $tested_file, "reason: $m[1]", $temp_filenames);
2121+
show_result('SKIP', $tested, $tested_file, "reason: $m[1]");
21222122
} else {
2123-
show_result('SKIP', $tested, $tested_file, '', $temp_filenames);
2123+
show_result('SKIP', $tested, $tested_file, '');
21242124
}
21252125

21262126
$message = !empty($m[1]) ? $m[1] : '';
@@ -2138,7 +2138,7 @@ function run_test(string $php, $file, array $env): string
21382138
// Pretend we have an XFAIL section
21392139
$test->setSection('XFAIL', ltrim(substr($output, 5)));
21402140
} elseif ($output !== '') {
2141-
show_result("BORK", $output, $tested_file, 'reason: invalid output from SKIPIF', $temp_filenames);
2141+
show_result("BORK", $output, $tested_file, 'reason: invalid output from SKIPIF');
21422142
$PHP_FAILED_TESTS['BORKED'][] = [
21432143
'name' => $file,
21442144
'test_name' => '',
@@ -2154,7 +2154,7 @@ function run_test(string $php, $file, array $env): string
21542154

21552155
if (!extension_loaded("zlib") && $test->hasAnySections("GZIP_POST", "DEFLATE_POST")) {
21562156
$message = "ext/zlib required";
2157-
show_result('SKIP', $tested, $tested_file, "reason: $message", $temp_filenames);
2157+
show_result('SKIP', $tested, $tested_file, "reason: $message");
21582158
$junit->markTestAs('SKIP', $shortname, $tested, null, $message);
21592159
return 'SKIPPED';
21602160
}
@@ -2201,7 +2201,7 @@ function run_test(string $php, $file, array $env): string
22012201
}
22022202

22032203
$bork_info = "Redirect info must contain exactly one TEST string to be used as redirect directory.";
2204-
show_result("BORK", $bork_info, '', '', $temp_filenames);
2204+
show_result("BORK", $bork_info, '', '');
22052205
$PHP_FAILED_TESTS['BORKED'][] = [
22062206
'name' => $file,
22072207
'test_name' => '',
@@ -2217,7 +2217,7 @@ function run_test(string $php, $file, array $env): string
22172217
}
22182218

22192219
$bork_info = "Redirected test did not contain redirection info";
2220-
show_result("BORK", $bork_info, '', '', $temp_filenames);
2220+
show_result("BORK", $bork_info, '', '');
22212221
$PHP_FAILED_TESTS['BORKED'][] = [
22222222
'name' => $file,
22232223
'test_name' => '',
@@ -2613,7 +2613,7 @@ function run_test(string $php, $file, array $env): string
26132613
if (!$leaked && !$failed_headers) {
26142614
// If the test passed and CLEAN produced output, report test as borked.
26152615
if ($clean_output) {
2616-
show_result("BORK", $output, $tested_file, 'reason: invalid output from CLEAN', $temp_filenames);
2616+
show_result("BORK", $output, $tested_file, 'reason: invalid output from CLEAN');
26172617
$PHP_FAILED_TESTS['BORKED'][] = [
26182618
'name' => $file,
26192619
'test_name' => '',
@@ -2633,7 +2633,7 @@ function run_test(string $php, $file, array $env): string
26332633
$warn = true;
26342634
$info = " (warn: XLEAK section but test passes)";
26352635
} else {
2636-
show_result("PASS", $tested, $tested_file, '', $temp_filenames);
2636+
show_result("PASS", $tested, $tested_file, '');
26372637
$junit->markTestAs('PASS', $shortname, $tested);
26382638
return 'PASSED';
26392639
}
@@ -2749,7 +2749,7 @@ function run_test(string $php, $file, array $env): string
27492749
show_file_block('mem', file_get_contents($memcheck_filename));
27502750
}
27512751

2752-
show_result(implode('&', $restype), $tested, $tested_file, $info, $temp_filenames);
2752+
show_result(implode('&', $restype), $tested, $tested_file, $info);
27532753

27542754
foreach ($restype as $type) {
27552755
$PHP_FAILED_TESTS[$type . 'ED'][] = [
@@ -3276,8 +3276,7 @@ function show_result(
32763276
string $result,
32773277
string $tested,
32783278
string $tested_file,
3279-
string $extra = '',
3280-
?array $temp_filenames = null
3279+
string $extra = ''
32813280
): void {
32823281
global $SHOW_ONLY_GROUPS, $colorize, $github_actions;
32833282

0 commit comments

Comments
 (0)