helly Sat Aug 30 11:24:57 2008 UTC
Modified files:
/php-src run-tests.php
Log:
- Environment handling seems to have changed to respect unicode... so we
have to convert everything to binary before passing it along. A bunch of
tests suffer from this change in behavior as well. Can anyone explain to
me what was changed and why?
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.375&r2=1.376&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.375 php-src/run-tests.php:1.376
--- php-src/run-tests.php:1.375 Fri Aug 29 10:25:35 2008
+++ php-src/run-tests.php Sat Aug 30 11:24:56 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.375 2008/08/29 10:25:35 felixdv Exp $ */
+/* $Id: run-tests.php,v 1.376 2008/08/30 11:24:56 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
@@ -559,6 +559,7 @@
case 'p':
$php = $argv[++$i];
putenv("TEST_PHP_EXECUTABLE=$php");
+ $environment['TEST_PHP_EXECUTABLE'] =
$php;
break;
case 'q':
putenv('NO_INTERACTION=1');
@@ -608,7 +609,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.375 $' . "\n";
+ echo '$Revision: 1.376 $' . "\n";
exit(1);
default:
@@ -999,11 +1000,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, null, $env, array('suppress_errors' => true,
'binary_pipes' => true));
+ ), $pipes, null, $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
