jani Mon Dec 8 12:36:10 2008 UTC Modified files: (Branch: PHP_5_3) /php-src run-tests.php Log: - Sync with HEAD http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.53&r2=1.226.2.37.2.35.2.54&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.53 php-src/run-tests.php:1.226.2.37.2.35.2.54 --- php-src/run-tests.php:1.226.2.37.2.35.2.53 Sat Dec 6 12:00:37 2008 +++ php-src/run-tests.php Mon Dec 8 12:36:10 2008 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.53 2008/12/06 12:00:37 zoe Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.54 2008/12/08 12:36:10 jani 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 @@ -59,6 +59,11 @@ exit; } +// If __DIR__ is not defined, define it +if (!defined('__DIR__')) { + define('__DIR__', realpath(dirname(__FILE__))); +} + // If timezone is not set, use UTC. if (ini_get('date.timezone') == '') { date_default_timezone_set('UTC'); @@ -612,7 +617,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.53 $' . "\n"; + echo '$Revision: 1.226.2.37.2.35.2.54 $' . "\n"; exit(1); default: @@ -1003,11 +1008,16 @@ $data = ''; + $bin_env = array(); + foreach($env as $key => $value) { + $bin_env[(binary)$key] = (binary)$value; + } + $proc = proc_open($commandline, array( 0 => array('pipe', 'r'), 1 => array('pipe', 'w'), 2 => array('pipe', 'w') - ), $pipes, $cwd, $env, array('suppress_errors' => true, 'binary_pipes' => true)); + ), $pipes, $cwd, $bin_env, array('suppress_errors' => true, 'binary_pipes' => true)); if (!$proc) { return false;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php