X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=.travis.yml;h=3efac37936ba0174e5e8b0587a780d79c8d7a46a;hb=a8d9265a58e2a2d93a159de36f2b5d5efa658a51;hp=1492085206e33a85d32321d53da6cca9d82cd923;hpb=9762c0030e246ab42889656f5dd51c47bbb3789f;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 1492085..3efac37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,11 @@ dist: xenial
 
 env:
     global:
-        # temp workaround to xdebug 3.0.0 bug
-        - XDEBUG_MODE=coverage
-        - 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
@@ -36,34 +34,43 @@ php:
 before_install:
   # 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
+  #- sudo apt-get install -y apache2 libapache2-mod-fastcgi
+  #- sudo apt-get install -y privoxy
+  - sudo pwd
+  - sudo ls -la
+  - sudo ./tests/ci/setup/setup_apache.sh
+  - sudo ./tests/ci/setup/setup_privoxy.sh
+  - sudo ./tests/ci/setup/setup_php.sh
 
   # 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
+  # @todo move to setup_php
+  #- 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
 
 install:
   - composer install
 
-  # Re-enable xdebug for when we need to generate code coverage
-  - export COVERAGE_OPTS=""
-  - if [ "$TRAVIS_PHP_VERSION" = "7.3" -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
+  #- sudo ./tests/ci/setup/setup_apache.sh
+  #- sudo ./tests/ci/setup/setup_php.sh
+  #- sudo ./tests/ci/setup/setup_privoxy.sh
 
   # output what version of phpunit we got going
-  - vendor/bin/phpunit --version
+  - ./vendor/bin/phpunit --version
 
 script:
-  vendor/bin/phpunit $COVERAGE_OPTS tests
+  ./vendor/bin/phpunit $COVERAGE_OPTS tests
 
 after_failure:
+  # temp
+  - ps auxwww
+  - cat /etc/passwd
+  - sudo ls -ltr /var/log
+  - sudo ls -ltr /var/log/apache2
+  - 'sudo find /etc/apache2 | sed -e "s/[^-][^\/]*\// |/g" -e "s/|\([^ ]\)/|-\1/"'
+
   # Save as much info as we can to help developers
   - cat apache_error.log
   - cat apache_access.log