diff options
author | Ilia Alshanetsky <iliaa@php.net> | 2003-07-24 17:44:16 +0000 |
---|---|---|
committer | Ilia Alshanetsky <iliaa@php.net> | 2003-07-24 17:44:16 +0000 |
commit | 64d642188557c6ca67c7120cb3233906a73fca86 (patch) | |
tree | d42d0c3acd1ab9bc4f8dd1433094226610ab4190 /Makefile.global | |
parent | 3fbe69f49aae47fa6e624fb9e8dedbf29cd0f88f (diff) | |
download | php-git-64d642188557c6ca67c7120cb3233906a73fca86.tar.gz |
When encountering a test that users GET/POST make run-tests.php use CGI
sapi if it is avaliable.
If CLI sapi is not avaliable print a clear error when make test is executed.
Diffstat (limited to 'Makefile.global')
-rw-r--r-- | Makefile.global | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.global b/Makefile.global index d4004848e6..0492759aef 100644 --- a/Makefile.global +++ b/Makefile.global @@ -50,11 +50,15 @@ install-tester: install-su: install-pear install-tester -test: $(SAPI_CLI_PATH) - @TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ - TEST_PHP_SRCDIR=$(top_srcdir) \ - CC="$(CC)" \ - $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS) +test: + -@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \ + TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ + CC="$(CC)" \ + $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \ + else \ + echo "ERROR: Cannot run tests without CLI sapi."; \ + fi clean: find . -name \*.lo -o -name \*.o | xargs rm -f |