X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=039373224bb6340d81ca49498af4928b976bf9a1;hb=869cf1a4c3776b868d12f038475e391d4b8c935e;hp=0c69aa4dbe3dacec5449fcac4d3a53e173dec1a2;hpb=d4a01160eb1e5c9853c1610b9e144257a707538f;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 0c69aa4..0393732 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,38 @@
 language: php
 
 php:
-  - 5.2
   - 5.3
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - 7.1
   - hhvm
 
+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
+
 install:
-  # NB: the lib does not declare dependencies for now. Also, composer will not run on php 5.2
-  #composer install
+  # NB: the lib does not declare dependencies for now...
+  - composer self-update && composer install
 
 before_script:
-  # TODO: we should set up an Apache instance inside the Travis VM and test it.
-  # But it looks a bit complex, esp. as it seems that php has to be set up differently (cgi vs fpm) depending on version
-  # So for now we just take an easy way out using a known remote server.
-  # See: https://gist.github.com/roderik/3123962
-  # See: http://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
+  # Disable xdebug. NB: this should NOT be done for hhvm...
+  - if [ $TRAVIS_PHP_VERSION != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
+
+
+  # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./test/ci/travis/setup_php_fpm.sh; ./test/ci/travis/setup_apache.sh; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./test/ci/travis/setup_hhvm.sh; ./test/ci/travis/setup_apache_hhvm.sh; fi
+  - ./test/ci/travis/setup_privoxy.sh
 
 script:
-  php -d "include_path=.:./lib:./test" test/testsuite.php LOCALSERVER=gggeek.altervista.org URI=/sw/xmlrpc/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php
+  php -d "include_path=.:./lib:./test" test/testsuite.php LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1
+
+after_failure:
+  # Save as much info as we can to help developers
+  - cat apache_error.log
+  - cat apache_access.log