summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Roobol <sander@php.net>2002-06-16 10:58:54 +0000
committerSander Roobol <sander@php.net>2002-06-16 10:58:54 +0000
commitfcb692a75d32fbb2a31988df76b37ae5b7540086 (patch)
tree34437ef6ab27602fc0378318e727a016de0e99d3
parentc0736d6096428069e710c5c7c1b6e7161ef2f464 (diff)
downloadphp-git-fcb692a75d32fbb2a31988df76b37ae5b7540086.tar.gz
Made the tests (and not only run-tests.php) actually use php.ini-dist, and
removed unused php.ini file.
-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