From 81faf213c3ae85de2fd190fe2c6baba1310ca347 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 30 Sep 2010 11:16:45 +0000 Subject: [PATCH] Loosen the valgrind version check slightly in run-tests.php so that it works with the packaged valgrind in Ubuntu 10.04. --- run-tests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.php b/run-tests.php index cdcd674ed8..9271964764 100755 --- a/run-tests.php +++ b/run-tests.php @@ -572,7 +572,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-([0-9])\.([0-9])\.([0-9]+)([.-\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."); } -- 2.50.0