update manual

[plcapi.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 6ea8d32..ca0fb3a 100644 (file)
--- 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,7 +24,7 @@ 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
@@ -30,9 +33,12 @@ before_script:
   - ./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