X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=378e3b22be808a817c2a85fcaac932c05d836098;hb=0b12bc00b66987c69f46452deaf739f526ebbeed;hp=7a9b1dc14094ee7e206164c3a9690c28cadae23a;hpb=593257683d9741b1cf1862dd421d244e90751d3a;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 7a9b1dc..378e3b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,19 +7,17 @@ dist: xenial
 
 env:
     global:
-        - LOCALSERVER=localhost
+        - HTTPSERVER=localhost
         - URI=/demo/server/server.php
         - HTTPSSERVER=localhost
         - HTTPSURI=/demo/server/server.php
-        - PROXY=localhost:8080
+        - PROXYSERVER=localhost:8080
         # Travis currently compiles PHP with an oldish cURL/GnuTLS combination;
         # to make the tests pass when Apache has a bogus SSL cert whe need the full set of options below
         - HTTPSVERIFYHOST=0
         - HTTPSIGNOREPEER=1
         - SSLVERSION=0
         - DEBUG=0
-        # temp workaround to xdebug 3.0.0 bug
-        - XDEBUG_MODE=coverage
 
 php:
   #- 5.3
@@ -34,44 +32,49 @@ php:
   - 8.0
 
 before_install:
+  # @todo stop useless daemons to save memory: snapd, dockerd, ...
   # This is mandatory or the 'apt-get install' calls following will fail
   - sudo apt-get update -qq
-  - sudo apt-get install -y apache2 libapache2-mod-fastcgi
-  - sudo apt-get install -y privoxy
-
-  # Disable xdebug for speed (executing composer), but allow us to re-enable it later
-  - export XDEBUG_INI=`php -i | grep xdebug.ini | grep home/travis | grep -v '=>' | head -1`
-  - export XDEBUG_INI=${XDEBUG_INI/,/}
-  - if [ "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI" "$XDEBUG_INI.bak"; fi
+  # Just in case there are git misconfigurations: make sure scripts are executable
+  - sudo chmod 755 ./tests/ci/setup/*.sh
+  - sudo ./tests/ci/setup/setup_perl.sh
+  - sudo ./tests/ci/setup/setup_apache.sh
+  - sudo ./tests/ci/setup/setup_privoxy.sh
+  - ./tests/ci/setup/setup_php_travis.sh
 
 install:
   - composer install
 
-  # Re-enable xdebug for when we need to generate code coverage
-  - export COVERAGE_OPTS=""
-  - if [ "$TRAVIS_PHP_VERSION" = "7.4" -a "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI.bak" "$XDEBUG_INI" && export COVERAGE_OPTS="--coverage-clover=coverage.clover"; fi
-
 before_script:
-  # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
-  - ./tests/ci/travis/setup_php_fpm.sh
-  - ./tests/ci/travis/setup_apache.sh
-  - ./tests/ci/travis/setup_privoxy.sh
-
-  # output what version of phpunit we got going
-  - vendor/bin/phpunit --version
+  # Output what version of phpunit we got going
+  #- ./vendor/bin/phpunit --version
+  # Enable code coverage for a single version of php
+  - if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then ./tests/ci/setup/setup_code_coverage.sh enable && export PHPUNIT_OPTS="--coverage-clover=coverage.clover"; fi
 
 script:
-  vendor/bin/phpunit $COVERAGE_OPTS tests
+    - ./vendor/bin/phpunit -v $PHPUNIT_OPTS tests
+    - python3 demo/client/python/test.py
+    - perl demo/client/perl/test.pl
 
 after_failure:
-  # Save as much info as we can to help developers
-  - cat apache_error.log
-  - cat apache_access.log
+  # Troubleshoot test env build problems
+  #- ps auxwww
+  #- 'sudo find /etc/php | sed -e "s/[^-][^\/]*\// |/g" -e "s/|\([^ ]\)/|-\1/"'
+  #- php -i
+  #- ls -la /run/php
+  #- ls -ltr /var/log
+  #- sudo ls -ltr /var/log/apache2
+  #- 'sudo find /etc/apache2 | sed -e "s/[^-][^\/]*\// |/g" -e "s/|\([^ ]\)/|-\1/"'
+
+  # Show as much info as we can to help developers
+  - sudo cat /var/log/privoxy/*
+  - 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; fi
-  - if [ -f coverage.clover ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; 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