diff options
| author | Felipe Pena <felipe@php.net> | 2008-07-21 22:41:39 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-07-21 22:41:39 +0000 |
| commit | f349c14414c61c706b466d4bb2bd7e3de3087a2e (patch) | |
| tree | f61e2feceee61461a40de13e971ebd9b197c06b9 /Makefile.global | |
| parent | dab8b811c28a1f9f45c7db717bf890dc9d9db97a (diff) | |
| download | php-git-f349c14414c61c706b466d4bb2bd7e3de3087a2e.tar.gz | |
MFH:
- Removed ntest and utest
- Removed -U flag to `make test' just to test once each test
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/Makefile.global b/Makefile.global index 0cbfac4925..e0d4596ebc 100644 --- a/Makefile.global +++ b/Makefile.global @@ -85,7 +85,7 @@ test: all 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: all 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 |