summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.travis.yml5
-rw-r--r--Makefile2
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 8de3f4b88..74778ee29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ node_modules/
js/build/
js/*.xml
.rvm
+*.clover
# just sane ignores
.*.sw[po]
diff --git a/.travis.yml b/.travis.yml
index d6473d8e6..60eacefd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,5 +22,8 @@ script:
- wget https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2
- tar xjf phantomjs-1.9.0-linux-x86_64.tar.bz2
- sudo ln -s $(pwd)/phantomjs-1.9.0-linux-x86_64/bin/phantomjs /usr/bin/phantomjs
- - make unit-tests
- make javascript-tests
+ - make unit-tests
+ - wget https://scrutinizer-ci.com/ocular.phar
+ - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+
diff --git a/Makefile b/Makefile
index afe8ae32a..9ce89b19d 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ dist: clean
test: javascript-tests unit-tests integration-tests acceptance-tests
unit-tests:
- phpunit tests/unit
+ phpunit --coverage-clover=coverage.clover tests/unit
integration-tests: