@@ -497,7 +497,7 @@ function save_or_mail_results()
497
497
$ slow_min_ms = INF ;
498
498
499
499
$ cfgtypes = array ('show ' , 'keep ' );
500
- $ cfgfiles = array ('skip ' , 'php ' , 'clean ' , 'out ' , 'diff ' , 'exp ' );
500
+ $ cfgfiles = array ('skip ' , 'php ' , 'clean ' , 'out ' , 'diff ' , 'exp ' , ' mem ' );
501
501
$ cfg = array ();
502
502
503
503
foreach ($ cfgtypes as $ type ) {
@@ -860,7 +860,7 @@ function save_or_mail_results()
860
860
861
861
junit_save_xml ();
862
862
863
- if (getenv ('REPORT_EXIT_STATUS ' ) == 1 && ($ sum_results ['FAILED ' ] || $ sum_results ['BORKED ' ])) {
863
+ if (getenv ('REPORT_EXIT_STATUS ' ) == 1 && ($ sum_results ['FAILED ' ] || $ sum_results ['BORKED ' ] || $ sum_results [ ' LEAKED ' ] )) {
864
864
exit (1 );
865
865
}
866
866
@@ -997,8 +997,7 @@ function test_sort($a, $b)
997
997
save_or_mail_results ();
998
998
999
999
junit_save_xml ();
1000
-
1001
- if (getenv ('REPORT_EXIT_STATUS ' ) == 1 && ($ sum_results ['FAILED ' ] || $ sum_results ['BORKED ' ])) {
1000
+ if (getenv ('REPORT_EXIT_STATUS ' ) == 1 && ($ sum_results ['FAILED ' ] || $ sum_results ['LEAK ' ] || $ sum_results ['LEAKED ' ])) {
1002
1001
exit (1 );
1003
1002
}
1004
1003
exit (0 );
@@ -2215,6 +2214,10 @@ function run_test($php, $file, $env)
2215
2214
error_report ($ file , $ log_filename , $ tested );
2216
2215
}
2217
2216
}
2217
+
2218
+ if ($ valgrind && $ leaked && $ cfg ["show " ]["mem " ]) {
2219
+ show_file_block ('mem ' , file_get_contents ($ memcheck_filename ));
2220
+ }
2218
2221
2219
2222
show_result (implode ('& ' , $ restype ), $ tested , $ tested_file , $ info , $ temp_filenames );
2220
2223
0 commit comments