X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=ca0fb3a421f1877faf945b7bb9184dfaf533c78b;hb=1ee5faa414db41b8ca8d4684646e772593103727;hp=49507225691e22de5d893a74258bb13d6403ea2d;hpb=3ce375810da93d98e8e791f07c843f94ecabe8d9;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 4950722..ca0fb3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# NB: we need to use the Trusty images if we want to test on hhvm
+#dist: trusty
+
 language: php
 
 php:
@@ -7,7 +10,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  #- hhvm
 
 before_install:
   # This is mandatory or the 'apt-get install' calls following will fail
@@ -21,13 +24,21 @@ install:
 
 before_script:
   # Disable xdebug. NB: this should NOT be done for hhvm...
-  - if [ $TRAVIS_PHP_VERSION != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
+  - 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
-  - ./tests/ci/travis/setup_privoxy.sh
+  - ./test/ci/travis/setup_privoxy.sh
 
 script:
-  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 NOPROXY=1
+  # 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
+  php -d "include_path=.:./lib:./test" test/testsuite.php LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php PROXY=localhost:8080 HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1 SSLVERSION=3
+
+after_failure:
+  # Save as much info as we can to help developers
+  - cat apache_error.log
+  - cat apache_access.log
+  - php -i