dmitry Tue Jul 3 15:56:43 2007 UTC
Modified files:
/php-src Makefile.global
Log:
Fixed "make test" mistakes
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.81&r2=1.82&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.81 php-src/Makefile.global:1.82
--- php-src/Makefile.global:1.81 Fri Jun 29 15:13:33 2007
+++ php-src/Makefile.global Tue Jul 3 15:56:43 2007
@@ -83,15 +83,15 @@
$(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 \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo
php_ini_loaded_file();'`; \
- if test "$(INI_FILE)"; then \
- $(EGREP) -v '^extension[\t\ ]=' "$(INI_FILE)" >
$(top_builddir)/tmp-php.ini; \
+ 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) \
CC="$(CC)" \
- $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -U -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 -U -d
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
