sniper Fri Jun 29 14:30:36 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src Makefile.global
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57.2.5.2.9&r2=1.57.2.5.2.10&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.57.2.5.2.9
php-src/Makefile.global:1.57.2.5.2.10
--- php-src/Makefile.global:1.57.2.5.2.9 Fri Jun 29 11:47:36 2007
+++ php-src/Makefile.global Fri Jun 29 14:30:35 2007
@@ -69,10 +69,16 @@
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
[EMAIL PROTECTED] test ! -z "$(PHP_EXECUTABLE)" && test -x
"$(PHP_EXECUTABLE)"; then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
@@ -80,10 +86,10 @@
$(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) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
