summaryrefslogtreecommitdiff
path: root/run-tests.php
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-03-18 21:59:06 (GMT)
committerfoobar <sniper@php.net>2005-03-18 21:59:06 (GMT)
commitebb8d72d8893947248cff80ea6d9713c36a172ea (patch)
tree272a04f0391e07c3d44a814915491264fabc3267 /run-tests.php
parentd2731eb57577619549d7bde7c5edf1215c815aec (diff)
downloadphp-ebb8d72d8893947248cff80ea6d9713c36a172ea.tar.gz
Fix errors with -d having a check for invalid ini entries
Diffstat (limited to 'run-tests.php')
-rwxr-xr-xrun-tests.php15
1 files changed, 12 insertions, 3 deletions
diff --git a/run-tests.php b/run-tests.php
index 80b7271..134be50 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -163,7 +163,6 @@ More .INIs : " . (function_exists(\'php_ini_scanned_files\') ? str_replace("\n"
save_text($info_file, $php_info);
$ini_overwrites = array(
'output_handler=',
- 'zlib.output_compression=Off',
'open_basedir=',
'safe_mode=0',
'disable_functions=',
@@ -182,9 +181,19 @@ $ini_overwrites = array(
'auto_prepend_file=',
'auto_append_file=',
'magic_quotes_runtime=0',
- 'xdebug.default_enable=0',
- 'session.auto_start=0'
);
+
+/* Only add overwrites if the extension is loaded */
+if (extension_loaded('xdebug')) {
+ $ini_overwrites[] = 'xdebug.default_enable=0';
+}
+if (extension_loaded('zlib')) {
+ $ini_overwrites[] = 'zlib.output_compression=Off':
+}
+if (extension_loaded('session')) {
+ $ini_overwrites[] = 'session.auto_start=0'
+}
+
$info_params = array();
settings2array($ini_overwrites,$info_params);
settings2params($info_params);