lbarnaud Fri Sep 12 14:15:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php
Log:
MFH: Fix cwd when running tests out of tree with ZTS builds (fixes #45837)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.46&r2=1.226.2.37.2.35.2.47&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.46
php-src/run-tests.php:1.226.2.37.2.35.2.47
--- php-src/run-tests.php:1.226.2.37.2.35.2.46 Mon Sep 8 09:23:51 2008
+++ php-src/run-tests.php Fri Sep 12 14:15:05 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.46 2008/09/08 09:23:51 lbarnaud Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.47 2008/09/12 14:15:05 lbarnaud 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
@@ -609,7 +609,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.46
$' . "\n";
+ echo '$Revision: 1.226.2.37.2.35.2.47
$' . "\n";
exit(1);
default:
@@ -996,7 +996,7 @@
function system_with_timeout($commandline, $env = null, $stdin = null)
{
- global $leak_check;
+ global $leak_check, $cwd;
$data = '';
@@ -1004,7 +1004,7 @@
0 => array('pipe', 'r'),
1 => array('pipe', 'w'),
2 => array('pipe', 'w')
- ), $pipes, null, $env, array('suppress_errors' => true,
'binary_pipes' => true));
+ ), $pipes, $cwd, $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
