helly           Sun Dec 18 12:11:54 2005 EDT

  Modified files:              
    /php-src    run-tests.php 
  Log:
  - Increase timeut for -m testing
  
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.260&r2=1.261&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.260 php-src/run-tests.php:1.261
--- php-src/run-tests.php:1.260 Sat Dec 17 16:33:53 2005
+++ php-src/run-tests.php       Sun Dec 18 12:11:54 2005
@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: run-tests.php,v 1.260 2005/12/17 16:33:53 iliaa Exp $ */
+/* $Id: run-tests.php,v 1.261 2005/12/18 12:11:54 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
@@ -350,7 +350,7 @@
                                        $html_output = is_resource($html_file);
                                        break;
                                case '--version':
-                                       echo "$Revision: 1.260 $\n";
+                                       echo "$Revision: 1.261 $\n";
                                        exit(1);
                                default:
                                        echo "Illegal switch specified!\n";
@@ -775,6 +775,8 @@
 
 function system_with_timeout($commandline)
 {
+       global $leak_check;
+
        $data = "";
        
        $proc = proc_open($commandline, array(
@@ -793,7 +795,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

Reply via email to