summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott MacVicar <scottmac@php.net>2008-11-08 02:05:03 +0000
committerScott MacVicar <scottmac@php.net>2008-11-08 02:05:03 +0000
commitdf7f836d315c9e16c92f9df2ec2dfdd6211c2e55 (patch)
tree5e3951db073ecece202cc0370a8b7d4158600a27
parent9d052f239feae6407a9a740dac04f70ecd8e2698 (diff)
downloadphp-git-df7f836d315c9e16c92f9df2ec2dfdd6211c2e55.tar.gz
MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
Save the bunnies
-rwxr-xr-xrun-tests.php2
1 files changed, 1 insertions, 1 deletions
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.");
}