summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNuno Lopes <nlopess@php.net>2014-02-08 06:54:27 -0500
committerNuno Lopes <nlopess@php.net>2014-02-08 07:06:44 -0500
commitf46200bcc044a9bea7427f88cf2945b7449b5f2d (patch)
treef56f9194b958b725870adb06237ffdfb92c1ad11
parent363ff60475d93716722034b8f7a2486229bf4cfb (diff)
downloadphp-git-f46200bcc044a9bea7427f88cf2945b7449b5f2d.tar.gz
fix regex to detect valgrind version
New PCRE version got stricter
-rwxr-xr-xrun-tests.php2
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.");
}