- Drop requirement for php.ini-dist

- Adjust test script to hard code ini settings

1 files changed, 0 insertions, 9 deletions

diff --git a/run-tests.php b/run-tests.php
index 88f95b5031..b7c9f17df8 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();