diff options
author | Nuno Lopes <nlopess@php.net> | 2014-02-08 06:54:27 -0500 |
---|---|---|
committer | Nuno Lopes <nlopess@php.net> | 2014-02-08 06:54:27 -0500 |
commit | 62404e767afbeadfaf6e0ceb8e53567238a75499 (patch) | |
tree | 6bd9ebb858ece2f031f25a0a61c58f9f8fa7193c /run-tests.php | |
parent | 2c34d81e7df6089b81a77fee160666d7c4a866fe (diff) | |
download | php-git-62404e767afbeadfaf6e0ceb8e53567238a75499.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 d53c3b6c5e..305b48d933 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."); } |