X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=2f500cbd14c49b2dcf3141a24debe8236f640d83;hb=8a6d52dd1915d5f9b706d3a4ec93b944e78f8f53;hp=4d9874071eadd41c0fefa01542ae3c75a716a59d;hpb=f5456e63644d3d34194912d7c371759807be30ed;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 4d98740..2f500cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,22 @@ language: php
 
 # As of May 2019, Travis is deprecating VMs based on Precise, which means that we can only test on php >= 5.6 going forward
 # (nb: this is not necessarily true yet - and we can use a different base for each php version, but we'll have to
-# adapt the apache / env setup scripts to accommodate that...)
+# adapt composer.json plus the apache / env setup scripts to accommodate that...)
 dist: xenial
 
-
-global:
-    # temp workaround to xdebug 3.0.0 bug
-    - XDEBUG_MODE=coverage
+env:
+    global:
+        - HTTPSERVER=localhost
+        - URI=/demo/server/server.php
+        - HTTPSSERVER=localhost
+        - HTTPSURI=/demo/server/server.php
+        - PROXYSERVER=localhost:8080
+        # 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
+        - HTTPSVERIFYHOST=0
+        - HTTPSIGNOREPEER=1
+        - SSLVERSION=0
+        - DEBUG=0
 
 php:
   #- 5.3
@@ -25,36 +34,30 @@ 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
-
-  # Disable xdebug for speed (executing composer), but allow us to re-enable it later
-  - 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
+  # 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_travis.sh
 
 install:
   - composer install
 
-  # Re-enable xdebug for when we need to generate code coverage
-  - export COVERAGE_OPTS=""
-  - if [ "$TRAVIS_PHP_VERSION" = "7.3" -a "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI.bak" "$XDEBUG_INI" && export COVERAGE_OPTS="--coverage-clover=coverage.clover"; fi
-
 before_script:
-  # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
-  - ./tests/ci/travis/setup_php_fpm.sh
-  - ./tests/ci/travis/setup_apache.sh
-  - ./tests/ci/travis/setup_privoxy.sh
-
-  # output what version of phpunit we got going
-  - vendor/bin/phpunit --version
+  # Output what version of phpunit we got going
+  - ./vendor/bin/phpunit --version
 
 script:
-  # 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
-  vendor/bin/phpunit $COVERAGE_OPTS tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php PROXY=localhost:8080 HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1 SSLVERSION=0 DEBUG=0
+  ./vendor/bin/phpunit $COVERAGE_OPTS tests
 
 after_failure:
+  # temp
+  - ps auxwww
+  - cat /etc/passwd
+  - sudo ls -ltr /var/log
+  - sudo ls -ltr /var/log/apache2
+  - 'sudo find /etc/apache2 | sed -e "s/[^-][^\/]*\// |/g" -e "s/|\([^ ]\)/|-\1/"'
+
   # Save as much info as we can to help developers
   - cat apache_error.log
   - cat apache_access.log