FAQ
Commit: f46200bcc044a9bea7427f88cf2945b7449b5f2d
Author: Nuno Lopes <nlopess@php.net> Sat, 8 Feb 2014 06:54:27 -0500
Parents: 363ff60475d93716722034b8f7a2486229bf4cfb
Branches: PHP-5.6

Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f46200bcc044a9bea7427f88cf2945b7449b5f2d

Log:
fix regex to detect valgrind version
New PCRE version got stricter

Changed paths:
   M run-tests.php


Diff:
diff --git a/run-tests.php b/run-tests.php
index cd6038e..f4e1599 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.");
        }

Search Discussions

Discussion Posts

Previous

Follow ups

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 2 of 3 | next ›
Discussion Overview
groupphp-cvs @
categoriesphp
postedFeb 8, '14 at 12:05p
activeFeb 8, '14 at 12:07p
posts3
users1
websitephp.net

1 user in discussion

Nuno Lopes: 3 posts

People

Translate

site design / logo © 2017 Grokbase