@@ -154,7 +154,7 @@ function main(): void
154
154
global $ DETAILED , $ PHP_FAILED_TESTS , $ SHOW_ONLY_GROUPS , $ argc , $ argv , $ cfg ,
155
155
$ cfgfiles , $ cfgtypes , $ conf_passed , $ end_time , $ environment ,
156
156
$ exts_to_test , $ failed_tests_file ,
157
- $ ignored_by_ext , $ ini_overwrites , $ is_switch , $ colorize ,
157
+ $ ini_overwrites , $ is_switch , $ colorize ,
158
158
$ log_format , $ matches , $ no_clean , $ no_file_cache ,
159
159
$ optionals , $ pass_option_n , $ pass_options ,
160
160
$ pattern_match , $ php , $ php_cgi , $ phpdbg , $ preload , $ redir_tests ,
@@ -735,7 +735,6 @@ function main(): void
735
735
} else {
736
736
// Compile a list of all test files (*.phpt).
737
737
$ test_files = [];
738
- $ ignored_by_ext = [];
739
738
sort ($ exts_to_test );
740
739
$ test_dirs = [];
741
740
$ optionals = ['Zend ' , 'tests ' , 'ext ' , 'sapi ' ];
@@ -752,11 +751,11 @@ function main(): void
752
751
}
753
752
754
753
foreach ($ test_dirs as $ dir ) {
755
- find_files (TEST_PHP_SRCDIR . "/ {$ dir }" , $ dir == ' ext ' );
754
+ find_files (TEST_PHP_SRCDIR . "/ {$ dir }" );
756
755
}
757
756
758
757
foreach ($ user_tests as $ dir ) {
759
- find_files ($ dir, $ dir == ' ext ' );
758
+ find_files ($ dir );
760
759
}
761
760
762
761
$ test_files = array_unique ($ test_files );
@@ -1045,9 +1044,9 @@ function get_binary(string $php, string $sapi, string $sapi_path): ?string
1045
1044
return null ;
1046
1045
}
1047
1046
1048
- function find_files (string $ dir, bool $ is_ext_dir = false , bool $ ignore = false ): void
1047
+ function find_files (string $ dir ): void
1049
1048
{
1050
- global $ test_files, $ ignored_by_ext ;
1049
+ global $ test_files ;
1051
1050
1052
1051
$ o = opendir ($ dir ) or error ("cannot open directory: $ dir " );
1053
1052
@@ -1057,7 +1056,7 @@ function find_files(string $dir, bool $is_ext_dir = false, bool $ignore = false)
1057
1056
}
1058
1057
1059
1058
if (is_dir ("{$ dir }/ {$ name }" )) {
1060
- find_files ("{$ dir }/ {$ name }" , false , $ ignore );
1059
+ find_files ("{$ dir }/ {$ name }" );
1061
1060
}
1062
1061
1063
1062
// Cleanup any left-over tmp files from last run.
@@ -1071,11 +1070,7 @@ function find_files(string $dir, bool $is_ext_dir = false, bool $ignore = false)
1071
1070
// many platforms)
1072
1071
if (substr ($ name , -5 ) == '.phpt ' && substr ($ name , 0 , 1 ) !== '. ' ) {
1073
1072
$ testfile = realpath ("{$ dir }/ {$ name }" );
1074
- if ($ ignore ) {
1075
- $ ignored_by_ext [] = $ testfile ;
1076
- } else {
1077
- $ test_files [] = $ testfile ;
1078
- }
1073
+ $ test_files [] = $ testfile ;
1079
1074
}
1080
1075
}
1081
1076
@@ -3029,10 +3024,9 @@ function settings2params(array $ini_settings): string
3029
3024
3030
3025
function compute_summary (): void
3031
3026
{
3032
- global $ n_total , $ test_results , $ ignored_by_ext , $ sum_results , $ percent_results ;
3027
+ global $ n_total , $ test_results , $ sum_results , $ percent_results ;
3033
3028
3034
3029
$ n_total = count ($ test_results );
3035
- $ n_total += count ($ ignored_by_ext );
3036
3030
$ sum_results = [
3037
3031
'PASSED ' => 0 ,
3038
3032
'WARNED ' => 0 ,
@@ -3048,7 +3042,6 @@ function compute_summary(): void
3048
3042
$ sum_results [$ v ]++;
3049
3043
}
3050
3044
3051
- $ sum_results ['SKIPPED ' ] += count ($ ignored_by_ext );
3052
3045
$ percent_results = [];
3053
3046
3054
3047
foreach ($ sum_results as $ v => $ n ) {
0 commit comments