summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xrun-tests.php1
-rw-r--r--tests/php.ini3
2 files changed, 1 insertions, 3 deletions
diff --git a/run-tests.php b/run-tests.php
index 697de2460e..41d72cc9c9 100755
--- 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
index 420ce754d9..0000000000
--- a/tests/php.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-;
-; Intentionally empty.
-; \ No newline at end of file