Patch run-tests.php.diff for Testing related Bug #60981

Patch version 2012-02-07 15:57 UTC

Obsoleted by patches:

• run-tests.php.diff, revision 2012-02-07 20:36 UTC

Developer: tyrael@php.net

Line 1 (now 1), was 22 lines, now 20 lines
 Index: run-tests.php
 ===================================================================
 --- run-tests.php       (revision 323116)
 +++ run-tests.php       (working copy)
 @@ -174,6 +174,17 @@
 --- run-tests-fixed.php 2012-02-07 16:52:07.000000000 +0100
 +++ run-tests.php       2012-02-07 16:36:21.000000000 +0100
 @@ -174,17 +174,6 @@
          $environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
   }
  
 +if(empty($_ENV)){
 +  $cmd = $environment['TEST_PHP_EXECUTABLE'].' -d variables_order=EGPCS -r \'echo serialize($_ENV);\'';
 +  $tmp_env = @unserialize(shell_exec($cmd));
 +  foreach($tmp_env as $i => $v){
 +    if(!in_array($i, array('TEST_PHP_EXECUTABLE', 'TEST_PHP_CGI_EXECUTABLE'))){
 +      $_ENV[$i] = $v;
 +      $environment[$i] = $v;
 +    }
 +  }
 +}
 +
 -if(empty($_ENV)){
 -  $cmd = $environment['TEST_PHP_EXECUTABLE'].' -d variables_order=EGPCS -r \'echo serialize($_ENV);\'';
 -  $tmp_env = @unserialize(shell_exec($cmd));
 -  foreach($tmp_env as $i => $v){
 -    if(!in_array($i, array('TEST_PHP_EXECUTABLE', 'TEST_PHP_CGI_EXECUTABLE'))){
 -      $_ENV[$i] = $v;
 -      $environment[$i] = $v;
 -    }
 -  }
 -}
 -
   function verify_config()
   {
          global $php;