]> granicus.if.org Git - php/commitdiff
Loosen the valgrind version check slightly in run-tests.php so that it works
authorAdam Harvey <aharvey@php.net>
Thu, 30 Sep 2010 11:16:45 +0000 (11:16 +0000)
committerAdam Harvey <aharvey@php.net>
Thu, 30 Sep 2010 11:16:45 +0000 (11:16 +0000)
with the packaged valgrind in Ubuntu 10.04.

run-tests.php

index cdcd674ed81bca7913a339cc5e8204c524034467..9271964764f345652062a56a2f529e65a30f7af4 100755 (executable)
@@ -572,7 +572,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.");
                                                }