X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=4e66ee57f422ac5ff5e0028f51dc00782e14fa2d;hb=548c116c86bc830180a472b723763b881b641c61;hp=722eebaf94c29e954897509d7cc8ed44707ec0c6;hpb=9d82621448996e47a3a5e9a6d3c7be23b983c6fe;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 722eeba..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,13 +65,13 @@ 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:
   # Upload code-coverage to Scrutinizer
-  - if [ -f coverage.clover ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover && echo 'code coverage uploaded to Scrutinizer'; fi
+  - if [ -f coverage.clover ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
   # Upload code-coverage CodeClimate - disabled as it does not support php 8 atm
   #- if [ -f coverage.clover ]; then CODECLIMATE_REPO_TOKEN=7fa6ee01e345090e059e5e42f3bfbcc8692feb8340396382dd76390a3019ac13 ./vendor/bin/test-reporter --coverage-report=coverage.clover; fi