jani Fri, 11 Dec 2009 07:34:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291972
Log:
- Fix problem with SKIPIF failing to skip in some cases (deprecated warnings
f.e.)
Changed paths:
U php/php-src/branches/PHP_5_2/run-tests.php
U php/php-src/branches/PHP_5_3/run-tests.php
U php/php-src/trunk/run-tests.php
Modified: php/php-src/branches/PHP_5_2/run-tests.php
===================================================================
--- php/php-src/branches/PHP_5_2/run-tests.php 2009-12-11 06:57:12 UTC (rev
291971)
+++ php/php-src/branches/PHP_5_2/run-tests.php 2009-12-11 07:34:06 UTC (rev
291972)
@@ -1426,7 +1426,7 @@
$env['USE_ZEND_ALLOC'] = '1';
}
- $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings $test_skipif", $env);
+ $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
Modified: php/php-src/branches/PHP_5_3/run-tests.php
===================================================================
--- php/php-src/branches/PHP_5_3/run-tests.php 2009-12-11 06:57:12 UTC (rev
291971)
+++ php/php-src/branches/PHP_5_3/run-tests.php 2009-12-11 07:34:06 UTC (rev
291972)
@@ -1426,7 +1426,7 @@
$env['USE_ZEND_ALLOC'] = '1';
}
- $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings $test_skipif", $env);
+ $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
Modified: php/php-src/trunk/run-tests.php
===================================================================
--- php/php-src/trunk/run-tests.php 2009-12-11 06:57:12 UTC (rev 291971)
+++ php/php-src/trunk/run-tests.php 2009-12-11 07:34:06 UTC (rev 291972)
@@ -1140,7 +1140,6 @@
global $leak_check, $temp_source, $temp_target, $cfg, $environment;
global $no_clean;
global $valgrind_version;
-
$temp_filenames = null;
$org_file = $file;
@@ -1427,7 +1426,7 @@
$env['USE_ZEND_ALLOC'] = '1';
}
- $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings $test_skipif", $env);
+ $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
