X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=4e66ee57f422ac5ff5e0028f51dc00782e14fa2d;hb=0f9530656d3085bd273f9d6aaa00dcf77c70c557;hp=9d1f3c0d5f21c97316c33ac206b867b68c74f42e;hpb=d254389a4b7d423c5b41c3e691fb4f057c247dda;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 9d1f3c0..4e66ee5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,13 +46,12 @@ install:
 
 before_script:
   # Output what version of phpunit we got going
-  - ./vendor/bin/phpunit --version
+  #- ./vendor/bin/phpunit --version
   # Enable code coverage for a single version of php
-  - if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then export PHP_OPTS="-d zend_extension=xdebug.so -d xdebug.mode=coverage" && export PHPUNIT_OPTS="--coverage-clover=coverage.clover"; fi
-  - echo "php $PHP_OPTS ./vendor/phpunit/phpunit/phpunit $PHPUNIT_OPTS tests"
+  - if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then ./tests/ci/setup/setup_code_coverage.sh enable && export PHPUNIT_OPTS="--coverage-clover=coverage.clover"; fi
 
 script:
-  php $PHP_OPTS ./vendor/phpunit/phpunit/phpunit $PHPUNIT_OPTS tests
+    ./vendor/bin/phpunit -v $PHPUNIT_OPTS tests
 
 after_failure:
   # Troubleshoot test env build problems
@@ -66,8 +65,8 @@ after_failure:
 
   # Show as much info as we can to help developers
   - sudo cat /var/log/privoxy/*
-  - cat apache_error.log
-  - cat apache_access.log
+  - sudo cat /var/log/apache2/error.log
+  - sudo cat /var/log/apache2/other_vhosts_access.log
   - sudo cat /var/log/php*.log
 
 after_script: