X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=c564652de5b2327ed52989200d13e27a46907526;hb=dec177e13bb5e03443e617646d36d678159ca0eb;hp=11361f56ca39a0fdbed4990a3d88dd49fe7a0b92;hpb=f5cb94477060332063a3d33cfb79f0bc5010545e;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 11361f5..c564652 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,28 +34,17 @@ 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
+  # Just in case there are git misconfigurations: make sure scripts are executable
+  - sudo chmod 755 ./tests/ci/setup/*.sh
   - 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
-  # @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
 
 before_script:
-  # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
-  #- 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
+  # Output what version of phpunit we got going
   - ./vendor/bin/phpunit --version
 
 script: