]> granicus.if.org Git - php/commitdiff
Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
authorScott MacVicar <scottmac@php.net>
Thu, 6 Nov 2008 03:08:58 +0000 (03:08 +0000)
committerScott MacVicar <scottmac@php.net>
Thu, 6 Nov 2008 03:08:58 +0000 (03:08 +0000)
run-tests.php

index 7899b38d865619977677e8d7a348d447e5f9fa4f..99af7c2635fde660305bb8edfa4d8ef9eb92df48 100755 (executable)
@@ -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.");
                                                }