diff options
| author | Sean Finney <seanius@debian.org> | 2010-02-07 22:19:53 +0100 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2010-02-07 22:27:07 +0100 |
| commit | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch) | |
| tree | 91f01b0d06916c78262404096bfd466b8e95e5b5 /run-tests.php | |
| parent | 176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff) | |
| parent | 0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff) | |
| download | php-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz | |
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/run-tests.php b/run-tests.php index 1043e191b..81f218b10 100755 --- a/run-tests.php +++ b/run-tests.php @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php 291972 2009-12-11 07:34:06Z jani $ */ +/* $Id: run-tests.php 286503 2009-07-29 10:06:55Z cellog $ */ /* 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 @@ -634,7 +634,7 @@ if (isset($argc) && $argc > 1) { $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 291972 $' . "\n"; + echo '$Revision: 286503 $' . "\n"; exit(1); default: @@ -1426,7 +1426,7 @@ TEST $file $env['USE_ZEND_ALLOC'] = '1'; } - $output = system_with_timeout("$extra $php $pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env); + $output = system_with_timeout("$extra $php $pass_options -q $ini_settings $test_skipif", $env); if (!$cfg['keep']['skip']) { @unlink($test_skipif); |