diff options
| author | Derick Rethans <github@derickrethans.nl> | 2016-05-10 15:40:09 -0400 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2016-05-10 15:40:09 -0400 |
| commit | 1c49a9fa71a9331d38ba72cc143bb96a920a2944 (patch) | |
| tree | d31ccd0b197ede3de516256672663f07e049bd47 /run-tests.php | |
| parent | 208c28f1527e16f114473e12bfbcf55e486671c5 (diff) | |
| parent | c35bd4861d498153ceb6839049b42c8bd5dd5c16 (diff) | |
| download | php-git-1c49a9fa71a9331d38ba72cc143bb96a920a2944.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/run-tests.php b/run-tests.php index d17ffe4baf..fd4e12081f 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1509,7 +1509,11 @@ TEST $file $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; + if ($req_ext == 'opcache') { + $ini_settings['zend_extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $req_ext . '.' . PHP_SHLIB_SUFFIX; + } else { + $ini_settings['extension'][] = $ext_dir . DIRECTORY_SEPARATOR . $req_ext . '.' . PHP_SHLIB_SUFFIX; + } } } } @@ -2336,7 +2340,7 @@ function settings2array($settings, &$ini_settings) $name = trim($setting[0]); $value = trim($setting[1]); - if ($name == 'extension') { + if ($name == 'extension' || $name == 'zend_extension') { if (!isset($ini_settings[$name])) { $ini_settings[$name] = array(); |