Made the tests (and not only run-tests.php) actually use php.ini-dist, and

removed unused php.ini file.

diff --git a/run-tests.php b/run-tests.php
index 697de2460ee6ab37db4a8e2c6179d8acc82d3942..41d72cc9c9b0fd91f89402cd2b7aed915fbb0a56 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -99,6 +99,7 @@ $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.
 

diff --git a/tests/php.ini b/tests/php.ini
deleted file mode 100644 (file)
index 420ce75..0000000
--- a/tests/php.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-;
-; Intentionally empty.
-;
\ No newline at end of file