This changes adds the --EXTENSION-- section to .phpt files as

described in http://marc.info/?t=132248616300007&r=1&w=2.
This commit is contained in:
Derick Rethans 2011-12-06 05:44:54 +00:00
parent 95784cf6c5
commit ac90e9c989

View File

@ -1246,7 +1246,7 @@ TEST $file
}
// Match the beginning of a section.
if (preg_match(b'/^--([_A-Z]+)--/', $line, $r)) {
if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
$section = $r[1];
settype($section, 'string');
@ -1483,6 +1483,18 @@ TEST $file
settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings);
}
// Additional required extensions
if (array_key_exists('EXTENSIONS', $section_text)) {
$ext_dir=`$php -r 'echo ini_get("extension_dir");'`;
$extensions = preg_split("/[\n\r]+/", trim($section_text['EXTENSIONS']));
$loaded = explode(",", `$php -n -r 'echo join(",", get_loaded_extensions());'`);
foreach ($extensions as $req_ext) {
if (!in_array($req_ext, $loaded)) {
$ini_settings['extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $req_ext . '.' . PHP_SHLIB_SUFFIX;
}
}
}
settings2params($ini_settings);
// Check if test should be skipped.