From 6b05b093731757c5525b53ec3847d46059716231 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Sat, 26 Mar 2016 20:55:16 +0100
Subject: use makefile to run tests

---
 .travis.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to '.travis.yml')

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:
-- 
cgit v1.2.3