add ability to show valgrind output with --show-mem

This commit is contained in:
Joe Watkins 2018-03-02 13:14:35 +01:00
parent c29f1f41c3
commit 03f15f705a
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E

11
run-tests.php Executable file → Normal file
View File

@ -497,7 +497,7 @@ $no_clean = false;
$slow_min_ms = INF;
$cfgtypes = array('show', 'keep');
$cfgfiles = array('skip', 'php', 'clean', 'out', 'diff', 'exp');
$cfgfiles = array('skip', 'php', 'clean', 'out', 'diff', 'exp', 'mem');
$cfg = array();
foreach($cfgtypes as $type) {
@ -860,7 +860,7 @@ HELP;
junit_save_xml();
if (getenv('REPORT_EXIT_STATUS') == 1 && ($sum_results['FAILED'] || $sum_results['BORKED'])) {
if (getenv('REPORT_EXIT_STATUS') == 1 && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
exit(1);
}
@ -997,8 +997,7 @@ if ($html_output) {
save_or_mail_results();
junit_save_xml();
if (getenv('REPORT_EXIT_STATUS') == 1 && ($sum_results['FAILED'] || $sum_results['BORKED'])) {
if (getenv('REPORT_EXIT_STATUS') == 1 && ($sum_results['FAILED'] || $sum_results['LEAK'] || $sum_results['LEAKED'])) {
exit(1);
}
exit(0);
@ -2216,6 +2215,10 @@ $output
}
}
if ($valgrind && $leaked && $cfg["show"]["mem"]) {
show_file_block('mem', file_get_contents($memcheck_filename));
}
show_result(implode('&', $restype), $tested, $tested_file, $info, $temp_filenames);
foreach ($restype as $type) {