cvs: php4 / run-tests.php

sander Sun May 19 10:48:27 2002 EDT Modified files: /php4 run-tests.php Log: Fix php.ini-related stuff in run-tests.php Index: php4/run-tests.php diff -u php4/run-tests.php:1.46 php4/run-tests.php:1.47 --- php4/run-tests.php:1.46 Sun May 19 09:53:59 2002 +++ php4/run-tests.php Sun May 19 10:48:27 2002 @@ -88,17 +88,17 @@ PHP_SAPI : " . PHP_SAPI . " PHP_VERSION : " . PHP_VERSION . " PHP_OS : " . PHP_OS . " -INI actual : " . get_cfg_var('cfg_file_path') . " +INI actual : " . realpath(get_cfg_var('cfg_file_path')) . " INI wanted : " . realpath('php.ini-dist') . " ===================================================================== "; // Make sure we are using the proper php.ini. -// FIXME: this doesn't work on linux -/*$php_ini = realpath("php.ini-dist"); -realpath(get_cfg_var('cfg_file_path')) == $php_ini - or error("php.ini-dist was not used!");*/ +$php_ini = realpath("php.ini-dist"); +if(realpath(get_cfg_var('cfg_file_path')) != $php_ini) { + error("php.ini-dist was not used!"); +} // Determine the tests to be run.