summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-03-26 20:55:16 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2016-03-26 20:55:16 +0100
commit6b05b093731757c5525b53ec3847d46059716231 (patch)
tree6fa021c8242f380eff8c8f4de5d398cc550780da /.travis.yml
parent466bc1f24461df64eae1c89877577cd15118c283 (diff)
use makefile to run tests
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 6 insertions, 10 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: