@@ -2118,9 +2118,9 @@ function run_test(string $php, $file, array $env): string
2118
2118
2119
2119
if (!strncasecmp ('skip ' , $ output , 4 )) {
2120
2120
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 ]" );
2122
2122
} else {
2123
- show_result ('SKIP ' , $ tested , $ tested_file , '' , $ temp_filenames );
2123
+ show_result ('SKIP ' , $ tested , $ tested_file , '' );
2124
2124
}
2125
2125
2126
2126
$ message = !empty ($ m [1 ]) ? $ m [1 ] : '' ;
@@ -2138,7 +2138,7 @@ function run_test(string $php, $file, array $env): string
2138
2138
// Pretend we have an XFAIL section
2139
2139
$ test ->setSection ('XFAIL ' , ltrim (substr ($ output , 5 )));
2140
2140
} 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 ' );
2142
2142
$ PHP_FAILED_TESTS ['BORKED ' ][] = [
2143
2143
'name ' => $ file ,
2144
2144
'test_name ' => '' ,
@@ -2154,7 +2154,7 @@ function run_test(string $php, $file, array $env): string
2154
2154
2155
2155
if (!extension_loaded ("zlib " ) && $ test ->hasAnySections ("GZIP_POST " , "DEFLATE_POST " )) {
2156
2156
$ message = "ext/zlib required " ;
2157
- show_result ('SKIP ' , $ tested , $ tested_file , "reason: $ message " , $ temp_filenames );
2157
+ show_result ('SKIP ' , $ tested , $ tested_file , "reason: $ message " );
2158
2158
$ junit ->markTestAs ('SKIP ' , $ shortname , $ tested , null , $ message );
2159
2159
return 'SKIPPED ' ;
2160
2160
}
@@ -2201,7 +2201,7 @@ function run_test(string $php, $file, array $env): string
2201
2201
}
2202
2202
2203
2203
$ 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 , '' , '' );
2205
2205
$ PHP_FAILED_TESTS ['BORKED ' ][] = [
2206
2206
'name ' => $ file ,
2207
2207
'test_name ' => '' ,
@@ -2217,7 +2217,7 @@ function run_test(string $php, $file, array $env): string
2217
2217
}
2218
2218
2219
2219
$ bork_info = "Redirected test did not contain redirection info " ;
2220
- show_result ("BORK " , $ bork_info , '' , '' , $ temp_filenames );
2220
+ show_result ("BORK " , $ bork_info , '' , '' );
2221
2221
$ PHP_FAILED_TESTS ['BORKED ' ][] = [
2222
2222
'name ' => $ file ,
2223
2223
'test_name ' => '' ,
@@ -2613,7 +2613,7 @@ function run_test(string $php, $file, array $env): string
2613
2613
if (!$ leaked && !$ failed_headers ) {
2614
2614
// If the test passed and CLEAN produced output, report test as borked.
2615
2615
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 ' );
2617
2617
$ PHP_FAILED_TESTS ['BORKED ' ][] = [
2618
2618
'name ' => $ file ,
2619
2619
'test_name ' => '' ,
@@ -2633,7 +2633,7 @@ function run_test(string $php, $file, array $env): string
2633
2633
$ warn = true ;
2634
2634
$ info = " (warn: XLEAK section but test passes) " ;
2635
2635
} else {
2636
- show_result ("PASS " , $ tested , $ tested_file , '' , $ temp_filenames );
2636
+ show_result ("PASS " , $ tested , $ tested_file , '' );
2637
2637
$ junit ->markTestAs ('PASS ' , $ shortname , $ tested );
2638
2638
return 'PASSED ' ;
2639
2639
}
@@ -2749,7 +2749,7 @@ function run_test(string $php, $file, array $env): string
2749
2749
show_file_block ('mem ' , file_get_contents ($ memcheck_filename ));
2750
2750
}
2751
2751
2752
- show_result (implode ('& ' , $ restype ), $ tested , $ tested_file , $ info, $ temp_filenames );
2752
+ show_result (implode ('& ' , $ restype ), $ tested , $ tested_file , $ info );
2753
2753
2754
2754
foreach ($ restype as $ type ) {
2755
2755
$ PHP_FAILED_TESTS [$ type . 'ED ' ][] = [
@@ -3276,8 +3276,7 @@ function show_result(
3276
3276
string $ result ,
3277
3277
string $ tested ,
3278
3278
string $ tested_file ,
3279
- string $ extra = '' ,
3280
- ?array $ temp_filenames = null
3279
+ string $ extra = ''
3281
3280
): void {
3282
3281
global $ SHOW_ONLY_GROUPS , $ colorize , $ github_actions ;
3283
3282
0 commit comments