From: Joe Watkins <krakjoe@php.net>
Date: Fri, 2 Mar 2018 12:14:35 +0000 (+0100)
Subject: add ability to show valgrind output with --show-mem
X-Git-Tag: php-7.3.0alpha1~271
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03f15f705ad30ce2dde7f7b2ab087a132b859ba0;p=php

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

diff --git a/run-tests.php b/run-tests.php
old mode 100755
new mode 100644
index cbef1dc367..e22106e964
--- a/run-tests.php
+++ b/run-tests.php
@@ -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);
@@ -2215,6 +2214,10 @@ $output
 			error_report($file, $log_filename, $tested);
 		}
 	}
+	
+	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);