From d53dd88854c8a53e3862b6883dcc65754a46cc51 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Tue, 8 Oct 2002 07:49:36 +0000 Subject: [PATCH] - Drop requirement for php.ini-dist - Adjust test script to hard code ini settings --- run-tests.php | 9 --------- tests/strings/004.phpt | 11 +++++++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/run-tests.php b/run-tests.php index 88f95b5031f..b7c9f17df89 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 3047421799c..596928cdff3 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-- --EXPECT-- -<br /><?php echo "foo"; ?><br /> +<br /><?php echo "foo"; ?><br /> [ -<br /><?php echo "bar"; ?><br /> +<br /><?php echo "bar"; ?><br /> ]