cvs: php-src(PHP_5_3) / Makefile.global
| From: | Felipe Pena | Date: | Mon, 21 Jul 2008 22:41:39 +0000 |
| Subject: | cvs: php-src(PHP_5_3) / Makefile.global | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-51352@lists.php.net to get a copy of this message | ||
felipe Mon Jul 21 22:41:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src Makefile.global
Log:
MFH:
- Removed ntest and utest
- Removed -U flag to `make test' just to test once each test
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57.2.5.2.14.2.1&r2=1.57.2.5.2.14.2.2&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.57.2.5.2.14.2.1 php-src/Makefile.global:1.57.2.5.2.14.2.2
--- php-src/Makefile.global:1.57.2.5.2.14.2.1 Sun Feb 17 20:50:03 2008
+++ php-src/Makefile.global Mon Jul 21 22:41:39 2008
@@ -85,7 +85,7 @@
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=modules/
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
+ $(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 "$$INI_FILE"; then \
@@ -96,39 +96,7 @@
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 -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
-
-utest: all
- -@if 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; \
- 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 -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
-
-ntest: all
- -@if 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; \
- 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 -c
$(top_builddir)/tmp-php.ini -N -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