aharvey                                  Thu, 30 Sep 2010 11:16:45 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=303891

Log:
Loosen the valgrind version check slightly in run-tests.php so that it works
with the packaged valgrind in Ubuntu 10.04.

Changed paths:
    U   php/php-src/branches/PHP_5_2/run-tests.php
    U   php/php-src/branches/PHP_5_3/run-tests.php
    U   php/php-src/trunk/run-tests.php

Modified: php/php-src/branches/PHP_5_2/run-tests.php
===================================================================
--- php/php-src/branches/PHP_5_2/run-tests.php  2010-09-30 11:04:21 UTC (rev 
303890)
+++ php/php-src/branches/PHP_5_2/run-tests.php  2010-09-30 11:16:45 UTC (rev 
303891)
@@ -572,7 +572,7 @@
                                        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.");
                                                }

Modified: php/php-src/branches/PHP_5_3/run-tests.php
===================================================================
--- php/php-src/branches/PHP_5_3/run-tests.php  2010-09-30 11:04:21 UTC (rev 
303890)
+++ php/php-src/branches/PHP_5_3/run-tests.php  2010-09-30 11:16:45 UTC (rev 
303891)
@@ -572,7 +572,7 @@
                                        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.");
                                                }

Modified: php/php-src/trunk/run-tests.php
===================================================================
--- php/php-src/trunk/run-tests.php     2010-09-30 11:04:21 UTC (rev 303890)
+++ php/php-src/trunk/run-tests.php     2010-09-30 11:16:45 UTC (rev 303891)
@@ -572,7 +572,7 @@
                                        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.");
                                                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to