scottmac Sat Nov 8 02:05:04 2008 UTC Modified files: (Branch: PHP_5_2) /php-src run-tests.php Log: MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN Save the bunnies http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.49&r2=1.226.2.37.2.50&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.49 php-src/run-tests.php:1.226.2.37.2.50 --- php-src/run-tests.php:1.226.2.37.2.49 Sat Nov 1 22:42:38 2008 +++ php-src/run-tests.php Sat Nov 8 02:05:03 2008 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.49 2008/11/01 22:42:38 jani Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.50 2008/11/08 02:05:03 scottmac Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -540,7 +540,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."); } @@ -608,7 +608,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.49 $' . "\n"; + echo '$Revision: 1.226.2.37.2.50 $' . "\n"; exit(1); default:
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php