- Drop requirement for php.ini-dist

- Adjust test script to hard code ini settings
gzysuzhou · Oct 8, 2002 · d53dd88 · d53dd88
1 parent 87e2718
commit d53dd88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/run-tests.php b/run-tests.php
@@ -97,19 +97,10 @@
 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
@@ -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">
-&lt;br /&gt;<font color="#0000CC">&lt;?php </font><font color="#006600">echo </font><font color="#CC0000">"foo"</font><font color="#006600">; </font><font color="#0000CC">?&gt;</font>&lt;br /&gt;</font>
+&lt;br /&gt;<font color="#0000BB">&lt;?php </font><font color="#007700">echo </font><font color="#DD0000">"foo"</font><font color="#007700">; </font><font color="#0000BB">?&gt;</font>&lt;br /&gt;</font>
 </code>
 [<code><font color="#000000">
-&lt;br /&gt;<font color="#0000CC">&lt;?php </font><font color="#006600">echo </font><font color="#CC0000">"bar"</font><font color="#006600">; </font><font color="#0000CC">?&gt;</font>&lt;br /&gt;</font>
+&lt;br /&gt;<font color="#0000BB">&lt;?php </font><font color="#007700">echo </font><font color="#DD0000">"bar"</font><font color="#007700">; </font><font color="#0000BB">?&gt;</font>&lt;br /&gt;</font>
 </code>]