helly Sun Dec 18 12:08:18 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src run-tests.php
Log:
- MFH Increase timeut for -m testing
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.14&r2=1.226.2.15&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.14 php-src/run-tests.php:1.226.2.15
--- php-src/run-tests.php:1.226.2.14 Sat Dec 17 16:33:38 2005
+++ php-src/run-tests.php Sun Dec 18 12:08:18 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.14 2005/12/17 16:33:38 iliaa Exp $ */
+/* $Id: run-tests.php,v 1.226.2.15 2005/12/18 12:08:18 helly 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
@@ -333,7 +333,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo "$Revision: 1.226.2.14 $\n";
+ echo "$Revision: 1.226.2.15 $\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -757,6 +757,8 @@
function system_with_timeout($commandline)
{
+ global $leak_check;
+
$data = "";
$proc = proc_open($commandline, array(
@@ -775,7 +777,7 @@
$r = $pipes;
$w = null;
$e = null;
- $n = @stream_select($r, $w, $e, 60);
+ $n = @stream_select($r, $w, $e, $leak_check ? 300 : 60);
if ($n === 0) {
/* timed out */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
