From: Nuno Lopes <nlopess@php.net>
Date: Sat, 8 Feb 2014 11:54:27 +0000 (-0500)
Subject: fix regex to detect valgrind version
X-Git-Tag: php-5.6.0alpha2~1^2~3^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62404e767afbeadfaf6e0ceb8e53567238a75499;p=php

fix regex to detect valgrind version
New PCRE version got stricter
---

diff --git a/run-tests.php b/run-tests.php
index d53c3b6c5e..305b48d933 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -581,7 +581,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-(\d)\.(\d)\.(\d+)([.\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.");
 						}