summaryrefslogtreecommitdiff
path: root/Makefile.global
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2007-06-29 14:30:35 (GMT)
committerfoobar <sniper@php.net>2007-06-29 14:30:35 (GMT)
commit9e1c9cad2dbe083d0d4b84747e52817b8beed3da (patch)
tree30233fd0f469e8feec91551aba04240694afa6f5 /Makefile.global
parenta074d2d66b1bfc0bb497687adb4a12189c7cb1e0 (diff)
downloadphp-9e1c9cad2dbe083d0d4b84747e52817b8beed3da.tar.gz
MFH
Diffstat (limited to 'Makefile.global')
-rw-r--r--Makefile.global18
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.global b/Makefile.global
index 8115f1e..b46ff2d 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -69,10 +69,16 @@ install-headers:
install-su: install-pear
-PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z "$(PHP_MODULES)"; then for i in $(PHP_MODULES); do . $$i ; echo -n "-d extension=$$dlname "; done; fi;)`
-PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SHARED_EXTENSIONS = ` \
+ if test "$(PHP_MODULES)"; then \
+ for i in "$(PHP_MODULES)"; do \
+ . $$i; shared_exts="$$exts -d extension=$$dlname"; \
+ done; \
+ echo $$shared_exts; \
+ fi`
-test: all
+test: all
-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
@@ -80,10 +86,10 @@ test: all
$(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 \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \
- if test -z "$(INI_FILE)"; then \
- echo "" > $(top_builddir)/tmp-php.ini; \
- else \
+ if test "$(INI_FILE)"; then \
$(EGREP) -v '^extension[\t\ ]=' "$(INI_FILE)" > $(top_builddir)/tmp-php.ini; \
+ else \
+ echo > $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \