summaryrefslogtreecommitdiff
path: root/Makefile.global
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2007-06-09 11:53:12 (GMT)
committerfoobar <sniper@php.net>2007-06-09 11:53:12 (GMT)
commitf199649ad6d686383da12201dadf1b76583a45b3 (patch)
treed706997d858962b1011abb30a0e90e8ba19b6173 /Makefile.global
parentf7d22b60f03ba0306e105feffb803ded42d00cda (diff)
downloadphp-f199649ad6d686383da12201dadf1b76583a45b3.tar.gz
MFH
Diffstat (limited to 'Makefile.global')
-rw-r--r--Makefile.global3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.global b/Makefile.global
index ebcaf34..ea9866b 100644
--- 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