@@ -736,9 +736,9 @@ function main(): void
736
736
} else {
737
737
// Compile a list of all test files (*.phpt).
738
738
$ test_files = [];
739
- $ exts_tested = count ( $ exts_to_test) ;
740
- $ exts_skipped = 0 ;
741
- $ ignored_by_ext = 0 ;
739
+ $ exts_tested = $ exts_to_test ;
740
+ $ exts_skipped = [] ;
741
+ $ ignored_by_ext = [] ;
742
742
sort ($ exts_to_test );
743
743
$ test_dirs = [];
744
744
$ optionals = ['Zend ' , 'tests ' , 'ext ' , 'sapi ' ];
@@ -1087,7 +1087,7 @@ function find_files(string $dir, bool $is_ext_dir = false, bool $ignore = false)
1087
1087
if (is_dir ("{$ dir }/ {$ name }" ) && !in_array ($ name , ['. ' , '.. ' , '.svn ' ])) {
1088
1088
$ skip_ext = ($ is_ext_dir && !in_array (strtolower ($ name ), $ exts_to_test ));
1089
1089
if ($ skip_ext ) {
1090
- $ exts_skipped++ ;
1090
+ $ exts_skipped[] = $ name ;
1091
1091
}
1092
1092
find_files ("{$ dir }/ {$ name }" , false , $ ignore || $ skip_ext );
1093
1093
}
@@ -1102,10 +1102,10 @@ function find_files(string $dir, bool $is_ext_dir = false, bool $ignore = false)
1102
1102
// (but not those starting with a dot, which are hidden on
1103
1103
// many platforms)
1104
1104
if (substr ($ name , -5 ) == '.phpt ' && substr ($ name , 0 , 1 ) !== '. ' ) {
1105
+ $ testfile = realpath ("{$ dir }/ {$ name }" );
1105
1106
if ($ ignore ) {
1106
- $ ignored_by_ext++ ;
1107
+ $ ignored_by_ext[] = $ testfile ;
1107
1108
} else {
1108
- $ testfile = realpath ("{$ dir }/ {$ name }" );
1109
1109
$ test_files [] = $ testfile ;
1110
1110
}
1111
1111
}
@@ -3097,7 +3097,7 @@ function compute_summary(): void
3097
3097
global $ n_total , $ test_results , $ ignored_by_ext , $ sum_results , $ percent_results ;
3098
3098
3099
3099
$ n_total = count ($ test_results );
3100
- $ n_total += $ ignored_by_ext ;
3100
+ $ n_total += count ( $ ignored_by_ext) ;
3101
3101
$ sum_results = [
3102
3102
'PASSED ' => 0 ,
3103
3103
'WARNED ' => 0 ,
@@ -3113,7 +3113,7 @@ function compute_summary(): void
3113
3113
$ sum_results [$ v ]++;
3114
3114
}
3115
3115
3116
- $ sum_results ['SKIPPED ' ] += $ ignored_by_ext ;
3116
+ $ sum_results ['SKIPPED ' ] += count ( $ ignored_by_ext) ;
3117
3117
$ percent_results = [];
3118
3118
3119
3119
foreach ($ sum_results as $ v => $ n ) {
@@ -3145,8 +3145,8 @@ function get_summary(bool $show_ext_summary): string
3145
3145
=====================================================================
3146
3146
TEST RESULT SUMMARY
3147
3147
---------------------------------------------------------------------
3148
- Exts skipped : ' . sprintf ('%4d ' , $ exts_skipped ) . '
3149
- Exts tested : ' . sprintf ('%4d ' , $ exts_tested ) . '
3148
+ Exts skipped : ' . sprintf ('%4d ' , count ( $ exts_skipped )) . ' ( ' . implode ( ' , ' , $ exts_skipped ) . ' )
3149
+ Exts tested : ' . sprintf ('%4d ' , count ( $ exts_tested) ) . '
3150
3150
---------------------------------------------------------------------
3151
3151
' ;
3152
3152
}
0 commit comments