diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-03-26 20:55:16 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-03-26 20:55:16 +0100 |
| commit | 6b05b093731757c5525b53ec3847d46059716231 (patch) | |
| tree | 6fa021c8242f380eff8c8f4de5d398cc550780da | |
| parent | 466bc1f24461df64eae1c89877577cd15118c283 (diff) | |
use makefile to run tests
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 9de0cfd1b..ee3c4e915 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,16 +52,12 @@ before_script: - cd apps/news script: - # unit tests - - phpunit -c phpunit.xml --coverage-clover coverage.clover - - phpunit -c phpunit.integration.xml - - php ocular.phar code-coverage:upload --format=php-clover coverage.clover - - cd js - - gulp karma - # acceptance tests - #- webdriver-manager update - # debug section to check what went wrong - - cd .. + - make test + +after_success: + - php ocular.phar code-coverage:upload --format=php-clover build/php-unit.clover + +after_failure: - sudo cat ../../data/owncloud.log deploy: @@ -167,8 +167,8 @@ ifeq (, $(shell which phpunit 2> /dev/null)) @echo "No phpunit command available, downloading a copy from the web" mkdir -p $(build_tools_directory) curl -sSL https://phar.phpunit.de/phpunit.phar -o $(build_tools_directory)/phpunit.phar - php $(build_tools_directory)/phpunit.phar -c phpunit.xml - php $(build_tools_directory)/phpunit.phar -c phpunit.integration.xml + php $(build_tools_directory)/phpunit.phar -c phpunit.xml --coverage-clover build/php-unit.clover + php $(build_tools_directory)/phpunit.phar -c phpunit.integration.xml --coverage-clover build/php-integration.clover else phpunit -c phpunit.xml phpunit -c phpunit.integration.xml |