diff options
| author | Derick Rethans <derick@php.net> | 2002-10-08 07:49:36 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2002-10-08 07:49:36 +0000 |
| commit | d53dd88854c8a53e3862b6883dcc65754a46cc51 (patch) | |
| tree | f3a84d0f9dd69cb261d53418bcaa9f8c7da7ec0d | |
| parent | 87e271833bcf16352cc89399c0a184d28004c162 (diff) | |
| download | php-git-d53dd88854c8a53e3862b6883dcc65754a46cc51.tar.gz | |
- Drop requirement for php.ini-dist
- Adjust test script to hard code ini settings
| -rwxr-xr-x | run-tests.php | 9 | ||||
| -rw-r--r-- | tests/strings/004.phpt | 11 |
2 files changed, 9 insertions, 11 deletions
diff --git a/run-tests.php b/run-tests.php index 88f95b5031..b7c9f17df8 100755 --- a/run-tests.php +++ b/run-tests.php @@ -97,19 +97,10 @@ PHP_SAPI : " . PHP_SAPI . " PHP_VERSION : " . PHP_VERSION . " PHP_OS : " . PHP_OS . " INI actual : " . realpath(get_cfg_var('cfg_file_path')) . " -INI wanted : " . realpath('php.ini-dist') . " 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. $test_to_run = array(); diff --git a/tests/strings/004.phpt b/tests/strings/004.phpt index 3047421799..596928cdff 100644 --- a/tests/strings/004.phpt +++ b/tests/strings/004.phpt @@ -1,6 +1,13 @@ --TEST-- highlight_string() buffering --POST-- +--INI-- +highlight.string=#DD0000 +highlight.comment=#FF9900 +highlight.keyword=#007700 +highlight.bg=#FFFFFF +highlight.default=#0000BB +highlight.html=#000000 --GET-- --FILE-- <?php @@ -10,8 +17,8 @@ echo "\n[$var]\n"; ?> --EXPECT-- <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><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>] |