diff options
| author | Nuno Lopes <nlopess@php.net> | 2014-02-08 06:54:27 -0500 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2014-02-08 07:06:44 -0500 |
| commit | f46200bcc044a9bea7427f88cf2945b7449b5f2d (patch) | |
| tree | f56f9194b958b725870adb06237ffdfb92c1ad11 /run-tests.php | |
| parent | 363ff60475d93716722034b8f7a2486229bf4cfb (diff) | |
| download | php-git-f46200bcc044a9bea7427f88cf2945b7449b5f2d.tar.gz | |
fix regex to detect valgrind version
New PCRE version got stricter
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php index cd6038e9b1..f4e1599c53 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."); } |