[PHP-CVS] cvs: php4 / run-tests.php /tests/strings 004.phpt

[Derick Rethans]

derick          Tue Oct  8 03:49:36 2002 EDT

  Modified files:              
    /php4       run-tests.php 
    /php4/tests/strings 004.phpt 
  Log:
  - Drop requirement for php.ini-dist
  - Adjust test script to hard code ini settings
  
  
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.63 php4/run-tests.php:1.64
--- php4/run-tests.php:1.63     Mon Oct  7 23:00:06 2002
+++ php4/run-tests.php  Tue Oct  8 03:49:35 2002
@@ -97,18 +97,9 @@
 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.
 
Index: php4/tests/strings/004.phpt
diff -u php4/tests/strings/004.phpt:1.2 php4/tests/strings/004.phpt:1.3
--- php4/tests/strings/004.phpt:1.2     Sun Oct  6 13:37:25 2002
+++ php4/tests/strings/004.phpt Tue Oct  8 03:49:36 2002
@@ -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 @@
 ?>
 --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>]



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php