diff options
| author | Felipe Pena <felipe@php.net> | 2008-03-13 13:51:40 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-03-13 13:51:40 +0000 |
| commit | a8fc46afa7bf947ae4498d917cb65dd7e3202c7e (patch) | |
| tree | 6b13ddd283009da17f41aeae077ac37d3b8aba5d /run-tests.php | |
| parent | 3958a0999052cfd63fe065127ed541626c9848c7 (diff) | |
| download | php-git-a8fc46afa7bf947ae4498d917cb65dd7e3202c7e.tar.gz | |
Fix valgrind version validation (accepting "valgrind-3.2.1-Debian")
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 111add74d8..82f2fb2475 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1421,7 +1421,7 @@ TEST $file if (!$out) { 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]+)(\s+)/", '$1$2$3', $out, 1, $replace_count); + $valgrind_version = preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)(?:-\w+)?\s*/", '$1$2$3', $out, 1, $replace_count); if ($replace_count != 1 || !is_numeric($valgrind_version)) { error("Valgrind returned invalid version info (\"$out\"), cannot proceed."); } |
