X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=8f125db4448b529c39727a572ba67d5fb7fce2bb;hb=cd480e485efe208c24df5e835c550d601ed4d3f0;hp=a41255c6e5bf6de185d2ea56c82b109565c63d0b;hpb=2ba26aa6bc64d6cf742f3360920308b5bdbbd911;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index a41255c..8f125db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,13 @@ before_script:
   - if [ $TRAVIS_PHP_VERSION != "hhvm" -a $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-rm xdebug.ini; fi
 
   # We set up an Apache instance inside the Travis VM and test it.
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then ./tests/ci/travis/install_apache.sh; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = 'hhvm' ]; then ./tests/ci/travis/install_apache_hhvm.sh; fi"
+  - if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then ./tests/ci/travis/install_apache.sh; fi
+  - if [ '$TRAVIS_PHP_VERSION' = 'hhvm' ]; then ./tests/ci/travis/install_apache_hhvm.sh; fi
+  - ./tests/ci/travis/install_nginx.sh
 
 script:
   # to have code coverage: --coverage-clover=coverage.clover
-  phpunit tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php NOPROXY=1 DEBUG=1
+  phpunit tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php PROXY=localhost:8080 DEBUG=1
 
 #after_script:
 #  # upload code-coverage to Scrutinizer