MFH

diff --git a/Makefile.global b/Makefile.global
index ebcaf341947039acce4bd18058a551a07f3ba8ab..ea9866b85f142052e0c492194cf5c7c8be3366af 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -79,10 +79,11 @@ test: all
                CC="$(CC)" \
                        $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \
        elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
+               $(EGREP) -v '^extension[\t\ ]=' `$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'` > $(top_builddir)/tmp-php.ini; \
                TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
                TEST_PHP_SRCDIR=$(top_srcdir) \
                CC="$(CC)" \
-                       $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+                       $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
        else \
                echo "ERROR: Cannot run tests without CLI sapi."; \
        fi