From: Scott MacVicar <scottmac@php.net>
Date: Thu, 6 Nov 2008 03:09:41 +0000 (+0000)
Subject: MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
X-Git-Tag: BEFORE_NS_RULES_CHANGE~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=895eb069451d60f7b7d1c284d11b7e706295d91b;p=php

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

diff --git a/run-tests.php b/run-tests.php
index b135e617f8..67b4071936 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -543,7 +543,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.");
 						}