Merge origin/master

neilime · Jan 16, 2014 · 05d920f · 05d920f
2 parents e80f888 + f07f40e
commit 05d920f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ before_script:
  - cd tests
 
 script:
- - phpunit --coverage-clover ../build/logs/clover.xml
+ - phpunit
 
 after_script:
  - php vendor/bin/coveralls -v
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
@@ -16,4 +16,7 @@
  <file>../Module.php</file>
  </whitelist>
  </filter>
+ <logging>
+ <log type="coverage-clover" target="../build/logs/clover.xml"/>
+ </logging>
 </phpunit>