tony2001 Tue Jun 26 10:22:36 2007 UTC
Modified files:
/php-src Makefile.global
Log:
fix 'make test' on platforms with broken shells
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.75&r2=1.76&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.75 php-src/Makefile.global:1.76
--- php-src/Makefile.global:1.75 Sat Jun 9 12:07:40 2007
+++ php-src/Makefile.global Tue Jun 26 10:22:36 2007
@@ -66,8 +66,8 @@
fi \
done; \
fi
-
-PHP_TEST_SHARED_EXTENSIONS=`(for i in $(PHP_MODULES); do . $$i ; echo -n "-d
extension=$$dlname "; done)`
+
+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 'output_buffering=0' -d
'memory_limit=-1'
test: all
@@ -77,7 +77,12 @@
CC="$(CC)" \
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -U -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()) ?
php_ini_loaded_file() : "no_ini_file";'` > $(top_builddir)/tmp-php.ini; \
+ 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 \
+ $(EGREP) -v '^extension[\t\ ]=' "$(INI_FILE)" >
$(top_builddir)/tmp-php.ini; \
+ fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
