From 3f156fe6f9cae9fd9b6f978aaf5c230a6a8ec03d Mon Sep 17 00:00:00 2001 From: Sander Roobol Date: Sun, 19 May 2002 14:48:27 +0000 Subject: [PATCH] Fix php.ini-related stuff in run-tests.php --- run-tests.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/run-tests.php b/run-tests.php index e2e5bb0d4e..dbec5ae6d1 100755 --- a/run-tests.php +++ b/run-tests.php @@ -88,17 +88,17 @@ PHP : $php 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. -- 2.50.1