Done now, even though its a 3 character change I'd call it a new
feature to support development versions of valgrind.
Scott
On 8 Nov 2008, at 02:02, Jani Taskinen wrote:
Like writing (talking) to walls it is. Repeat helps?
(no, this change was not MFH'd yet, AFAICT)
--Jani
Jani Taskinen wrote:
PLEASE keep the run-test.php in sync in PHP_5_2 also..
--Jani
Scott MacVicar wrote:
scottmac Thu Nov 6 03:09:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php Log:
MFH: Support versions of valgrind from SVN. The version is shown
as 3.4.0.SVN
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.51&r2=1.226.2.37.2.35.2.52&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.51 php-src/run-
tests.php:1.226.2.37.2.35.2.52
--- php-src/run-tests.php:1.226.2.37.2.35.2.51 Mon Nov 3
13:07:28 2008
+++ php-src/run-tests.php Thu Nov 6 03:09:41 2008
@@ -24,7 +24,7 @@
+
----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28
felipe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41
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
@@ -543,7 +543,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.");
}
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.51 $' .
"\n";
+ echo '$Revision: 1.226.2.37.2.35.2.52 $' .
"\n";
exit(1);
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
