com php-src: Merge branch 'pull-request/1864': run-tests.php
| From: | Stanislav Malyshev | Date: | Mon, 05 Sep 2016 07:51:01 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/1864': run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94315@lists.php.net to get a copy of this message | ||
Commit: 9470cdd4c3780c78c00b50f0e7aed2633d556f5d
Author: Stanislav Malyshev <stas@php.net> Mon, 5 Sep 2016 00:51:01 -0700
Parents: 28bc2d797eb9de0f08ae95fae572a2f199177f3a ddf1c0891b919dd1d2cbfba064cb77ce1391486d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9470cdd4c3780c78c00b50f0e7aed2633d556f5d
Log:
Merge branch 'pull-request/1864'
* pull-request/1864:
Tiny tweak for
$header initialization, it should always be an array
Minor tweaks
Changed paths:
MM run-tests.php
Diff:
diff --cc run-tests.php
index 80757ed,24e127e..7da6df2
--- a/run-tests.php
+++ b/run-tests.php
@@@ -269,7 -269,7 +269,7 @@@ More .INIs : " , (function_exists(\'ph
@unlink($info_file);
// load list of enabled extensions
- save_text($info_file, '<?php echo str_replace("Zend OPcache",
"opcache", join(",", get_loaded_extensions())); ?>');
- save_text($info_file, '<?php echo implode(",", get_loaded_extensions());
?>');
++ save_text($info_file, '<?php echo str_replace("Zend OPcache",
"opcache", implode(",", get_loaded_extensions())); ?>');
$exts_to_test = explode(',',$php $pass_options $info_params $no_file_cache
"$info_file");
// check for extensions that need special handling and regenerate
$info_params_ex = array(
@@@ -1507,14 -1500,10 +1501,14 @@@ TEST $fil
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());');
+ $loaded = explode(",", $php -n -r 'echo implode(",",
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;
+ }
}
}
}
@@@ -1915,12 -1900,11 +1905,11 @@@ COMMAND $cm
$output = preg_replace("/\r\n/", "\n", trim($out));
/* when using CGI, strip the headers from the output */
- $headers = "";
+ $headers = array();
- if (isset($old_php) && preg_match("/^(..*?)\r?\n\r?\n(.*)/s", $out, $match)) {
+ if (!empty($uses_cgi) && preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) {
$output = trim($match[2]);
$rh = preg_split("/[\n\r]+/", $match[1]);
- $headers = array();
foreach ($rh as $line) {
if (strpos($line, ':') !== false) {