dmitry          Tue Aug 22 05:01:16 2006 UTC

  Modified files:              
    /php-src    run-tests.php 
  Log:
  Fixed "make test" on win32
  
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.304&r2=1.305&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.304 php-src/run-tests.php:1.305
--- php-src/run-tests.php:1.304 Mon Aug 14 21:08:02 2006
+++ php-src/run-tests.php       Tue Aug 22 05:01:15 2006
@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: run-tests.php,v 1.304 2006/08/14 21:08:02 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.305 2006/08/22 05:01:15 dmitry 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
@@ -400,7 +400,7 @@
                                        $html_output = is_resource($html_file);
                                        break;
                                case '--version':
-                                       echo '$Revision: 1.304 $'."\n";
+                                       echo '$Revision: 1.305 $'."\n";
                                        exit(1);
                                default:
                                        echo "Illegal switch specified!\n";
@@ -1383,9 +1383,10 @@
        }
 
        if ($leak_check) {
-               $cmd = "USE_ZEND_ALLOC=0 valgrind -q --tool=memcheck 
--trace-children=yes --log-file-exactly=$memcheck_filename $cmd";
+               $env['USE_ZEND_ALLOC'] = '0';
+               $cmd = "valgrind -q --tool=memcheck --trace-children=yes 
--log-file-exactly=$memcheck_filename $cmd";
        } else {
-               $cmd = "USE_ZEND_ALLOC=1 ".$cmd;
+               $env['USE_ZEND_ALLOC'] = '1';
        }
 
        if ($DETAILED) echo "

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to