felipe Thu Mar 13 13:51:40 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src run-tests.php
Log:
Fix valgrind version validation (accepting "valgrind-3.2.1-Debian")
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.44&r2=1.226.2.37.2.45&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.44
php-src/run-tests.php:1.226.2.37.2.45
--- php-src/run-tests.php:1.226.2.37.2.44 Mon Jan 14 04:34:17 2008
+++ php-src/run-tests.php Thu Mar 13 13:51:40 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.44 2008/01/14 04:34:17 cellog Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.45 2008/03/13 13:51:40 felipe 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
@@ -421,7 +421,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.44
$'."\n";
+ echo '$Revision: 1.226.2.37.2.45
$'."\n";
exit(1);
case 'u':
@@ -1421,7 +1421,7 @@
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.");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
