From: Scott MacVicar <scottmac@php.net>
Date: Sat, 8 Nov 2008 02:05:03 +0000 (+0000)
Subject: MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
X-Git-Tag: php-5.2.7RC4~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df7f836d315c9e16c92f9df2ec2dfdd6211c2e55;p=php

MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN

Save the bunnies
---

diff --git a/run-tests.php b/run-tests.php
index 2b0dfc0f75..c40592cd78 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -540,7 +540,7 @@ if (isset($argc) && $argc > 1) {
 					if (!$valgrind_header) {
 						error("Valgrind returned no version info, cannot proceed.\nPlease check if Valgrind is installed.");
 					} else {
-						$valgrind_version = preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/", '$1$2$3', $valgrind_header, 1, $replace_count);
+						$valgrind_version = preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)([.-]\w+)?(\s+)/", '$1$2$3', $valgrind_header, 1, $replace_count);
 						if ($replace_count != 1 || !is_numeric($valgrind_version)) {
 							error("Valgrind returned invalid version info (\"$valgrind_header\"), cannot proceed.");
 						}