sniper Sat Jun 9 11:53:12 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.3&r2=1.57.2.5.2.4&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.57.2.5.2.3
php-src/Makefile.global:1.57.2.5.2.4
--- php-src/Makefile.global:1.57.2.5.2.3 Wed Jun 6 18:28:13 2007
+++ php-src/Makefile.global Sat Jun 9 11:53:12 2007
@@ -79,10 +79,11 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
