mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
- Drop requirement for php.ini-dist
- Adjust test script to hard code ini settings
This commit is contained in:
parent
87e271833b
commit
d53dd88854
2 changed files with 9 additions and 11 deletions
|
@ -97,19 +97,10 @@ PHP_SAPI : " . PHP_SAPI . "
|
||||||
PHP_VERSION : " . PHP_VERSION . "
|
PHP_VERSION : " . PHP_VERSION . "
|
||||||
PHP_OS : " . PHP_OS . "
|
PHP_OS : " . PHP_OS . "
|
||||||
INI actual : " . realpath(get_cfg_var('cfg_file_path')) . "
|
INI actual : " . realpath(get_cfg_var('cfg_file_path')) . "
|
||||||
INI wanted : " . realpath('php.ini-dist') . "
|
|
||||||
More .INIs : " . str_replace("\n","", php_ini_scanned_files()) . "
|
More .INIs : " . str_replace("\n","", php_ini_scanned_files()) . "
|
||||||
=====================================================================
|
=====================================================================
|
||||||
";
|
";
|
||||||
|
|
||||||
// Make sure we are using the proper php.ini.
|
|
||||||
|
|
||||||
$php_ini = realpath("php.ini-dist");
|
|
||||||
if (realpath(get_cfg_var('cfg_file_path')) != $php_ini) {
|
|
||||||
error("php.ini-dist was not used!");
|
|
||||||
}
|
|
||||||
$php .= " -c $php_ini";
|
|
||||||
|
|
||||||
// Determine the tests to be run.
|
// Determine the tests to be run.
|
||||||
|
|
||||||
$test_to_run = array();
|
$test_to_run = array();
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
highlight_string() buffering
|
highlight_string() buffering
|
||||||
--POST--
|
--POST--
|
||||||
|
--INI--
|
||||||
|
highlight.string=#DD0000
|
||||||
|
highlight.comment=#FF9900
|
||||||
|
highlight.keyword=#007700
|
||||||
|
highlight.bg=#FFFFFF
|
||||||
|
highlight.default=#0000BB
|
||||||
|
highlight.html=#000000
|
||||||
--GET--
|
--GET--
|
||||||
--FILE--
|
--FILE--
|
||||||
<?php
|
<?php
|
||||||
|
@ -10,8 +17,8 @@ echo "\n[$var]\n";
|
||||||
?>
|
?>
|
||||||
--EXPECT--
|
--EXPECT--
|
||||||
<code><font color="#000000">
|
<code><font color="#000000">
|
||||||
<br /><font color="#0000CC"><?php </font><font color="#006600">echo </font><font color="#CC0000">"foo"</font><font color="#006600">; </font><font color="#0000CC">?></font><br /></font>
|
<br /><font color="#0000BB"><?php </font><font color="#007700">echo </font><font color="#DD0000">"foo"</font><font color="#007700">; </font><font color="#0000BB">?></font><br /></font>
|
||||||
</code>
|
</code>
|
||||||
[<code><font color="#000000">
|
[<code><font color="#000000">
|
||||||
<br /><font color="#0000CC"><?php </font><font color="#006600">echo </font><font color="#CC0000">"bar"</font><font color="#006600">; </font><font color="#0000CC">?></font><br /></font>
|
<br /><font color="#0000BB"><?php </font><font color="#007700">echo </font><font color="#DD0000">"bar"</font><font color="#007700">; </font><font color="#0000BB">?></font><br /></font>
|
||||||
</code>]
|
</code>]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue