archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

-move -d stuff into function and update settings for info call

Browse source
This commit is contained in:
Marcus Boerger 2002-11-01 13:03:30 +00:00
parent 20d7a682ab
commit ad414f28a9
1 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

69
run-tests.php
View file

@ -106,7 +106,20 @@ PHP_OS : " . PHP_OS . "
INI actual : " . realpath(get_cfg_var("cfg_file_path")) . " INI actual : " . realpath(get_cfg_var("cfg_file_path")) . "
More .INIs : " . str_replace("\n","", php_ini_scanned_files()); ?>'; More .INIs : " . str_replace("\n","", php_ini_scanned_files()); ?>';
save_text($info_file, $php_info); save_text($info_file, $php_info);
$php_info = `$php -d 'output_handler=' -d 'zlib.output_compression=' $info_file`; $settings = array(
'open_basedir=',
'safe_mode=0',
'output_buffering=Off',
'output_handler=',
'zlib.output_compression=',
'auto_prepend_file=',
'auto_append_file=',
'disable_functions='
);
$params = array();
settings2array($settings,$params);
settings2params($params);
$php_info = `$php $params $info_file`;
@unlink($info_file); @unlink($info_file);
// Write test context information. // Write test context information.
@ -511,36 +524,14 @@ TEST $file
"auto_prepend_file=", "auto_prepend_file=",
); );
$ini_settings = array(); $ini_settings = array();
foreach($settings as $setting) { settings2array($settings, $ini_settings);
if (strpos($setting, '=')!==false) {
$setting = explode("=", $setting);
$name = trim(strtolower($setting[0]));
$value = trim($setting[1]);
$ini_settings[$name] = $value;
}
}
// Any special ini settings // Any special ini settings
// these may overwrite the test defaults... // these may overwrite the test defaults...
if (array_key_exists('INI', $section_text)) { if (array_key_exists('INI', $section_text)) {
foreach(preg_split( "/[\n\r]+/", $section_text['INI']) as $setting) { settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings);
if (strpos($setting, '=')!==false) {
$setting = explode("=", $setting,2);
$name = trim(strtolower($setting[0]));
$value = trim($setting[1]);
$ini_settings[$name] = addslashes($value);
}
}
}
if (count($ini_settings)) {
$settings = '';
foreach($ini_settings as $name => $value) {
$settings .= " -d \"$name=$value\"";
}
$ini_settings = $settings;
} else {
$ini_settings = '';
} }
settings2params($ini_settings);
// We've satisfied the preconditions - run the test! // We've satisfied the preconditions - run the test!
save_text($tmp_file,$section_text['FILE']); save_text($tmp_file,$section_text['FILE']);
@ -711,6 +702,32 @@ function error($message)
exit(1); exit(1);
} }
function settings2array($settings, &$ini_settings)
{
foreach($settings as $setting) {
if (strpos($setting, '=')!==false) {
$setting = explode("=", $setting);
$name = trim(strtolower($setting[0]));
$value = trim($setting[1]);
$ini_settings[$name] = $value;
}
}
}
function settings2params(&$ini_settings)
{
if (count($ini_settings)) {
$settings = '';
foreach($ini_settings as $name => $value) {
$value = addslashes($value);
$settings .= " -d \"$name=$value\"";
}
$ini_settings = $settings;
} else {
$ini_settings = '';
}
}
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4