@@ -735,9 +735,9 @@ function main(): void
735
735
} else {
736
736
// Compile a list of all test files (*.phpt).
737
737
$ test_files = [];
738
- $ exts_tested = count ( $ exts_to_test) ;
739
- $ exts_skipped = 0 ;
740
- $ ignored_by_ext = 0 ;
738
+ $ exts_tested = $ exts_to_test ;
739
+ $ exts_skipped = [] ;
740
+ $ ignored_by_ext = [] ;
741
741
sort ($ exts_to_test );
742
742
$ test_dirs = [];
743
743
$ optionals = ['Zend ' , 'tests ' , 'ext ' , 'sapi ' ];
@@ -1053,7 +1053,7 @@ function find_files(string $dir, bool $is_ext_dir = false, bool $ignore = false)
1053
1053
if (is_dir ("{$ dir }/ {$ name }" ) && !in_array ($ name , ['. ' , '.. ' , '.svn ' ])) {
1054
1054
$ skip_ext = ($ is_ext_dir && !in_array (strtolower ($ name ), $ exts_to_test ));
1055
1055
if ($ skip_ext ) {
1056
- $ exts_skipped++ ;
1056
+ $ exts_skipped[] = $ name ;
1057
1057
}
1058
1058
find_files ("{$ dir }/ {$ name }" , false , $ ignore || $ skip_ext );
1059
1059
}
@@ -1068,10 +1068,10 @@ function find_files(string $dir, bool $is_ext_dir = false, bool $ignore = false)
1068
1068
// (but not those starting with a dot, which are hidden on
1069
1069
// many platforms)
1070
1070
if (substr ($ name , -5 ) == '.phpt ' && substr ($ name , 0 , 1 ) !== '. ' ) {
1071
+ $ testfile = realpath ("{$ dir }/ {$ name }" );
1071
1072
if ($ ignore ) {
1072
- $ ignored_by_ext++ ;
1073
+ $ ignored_by_ext[] = $ testfile ;
1073
1074
} else {
1074
- $ testfile = realpath ("{$ dir }/ {$ name }" );
1075
1075
$ test_files [] = $ testfile ;
1076
1076
}
1077
1077
}
@@ -3030,7 +3030,7 @@ function compute_summary(): void
3030
3030
global $ n_total , $ test_results , $ ignored_by_ext , $ sum_results , $ percent_results ;
3031
3031
3032
3032
$ n_total = count ($ test_results );
3033
- $ n_total += $ ignored_by_ext ;
3033
+ $ n_total += count ( $ ignored_by_ext) ;
3034
3034
$ sum_results = [
3035
3035
'PASSED ' => 0 ,
3036
3036
'WARNED ' => 0 ,
@@ -3046,7 +3046,7 @@ function compute_summary(): void
3046
3046
$ sum_results [$ v ]++;
3047
3047
}
3048
3048
3049
- $ sum_results ['SKIPPED ' ] += $ ignored_by_ext ;
3049
+ $ sum_results ['SKIPPED ' ] += count ( $ ignored_by_ext) ;
3050
3050
$ percent_results = [];
3051
3051
3052
3052
foreach ($ sum_results as $ v => $ n ) {
@@ -3078,8 +3078,8 @@ function get_summary(bool $show_ext_summary): string
3078
3078
=====================================================================
3079
3079
TEST RESULT SUMMARY
3080
3080
---------------------------------------------------------------------
3081
- Exts skipped : ' . sprintf ('%4d ' , $ exts_skipped ) . '
3082
- Exts tested : ' . sprintf ('%4d ' , $ exts_tested ) . '
3081
+ Exts skipped : ' . sprintf ('%4d ' , count ( $ exts_skipped )) . ' ( ' . implode ( ' , ' , $ exts_skipped ) . ' )
3082
+ Exts tested : ' . sprintf ('%4d ' , count ( $ exts_tested) ) . '
3083
3083
---------------------------------------------------------------------
3084
3084
' ;
3085
3085
}
0 commit comments