From: gggeek <giunta.gaetano@gmail.com>
Date: Sun, 13 Dec 2020 20:09:49 +0000 (+0000)
Subject: travis tests
X-Git-Tag: plcapi-7.1-0~3^2~124
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=eb5eff4da8469d12b26b386714d303e176f6181c;p=plcapi.git

travis tests
---

diff --git a/tests/ci/setup/setup_php_travis.sh b/tests/ci/setup/setup_php_travis.sh
index 704dcc1..edef50a 100755
--- a/tests/ci/setup/setup_php_travis.sh
+++ b/tests/ci/setup/setup_php_travis.sh
@@ -27,18 +27,6 @@ cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf.default ~/.phpenv/versions/${PH
 
 # work around travis issue #3385
 if [ -d ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d ]; then
-    #if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d)" ]; then
-    #  cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
-    #fi
-    #if [ "$TRAVIS_PHP_VERSION" = "7.1" -a -n "$(ls -A ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d)" ]; then
-    #  cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
-    #fi
-    #if [ "$TRAVIS_PHP_VERSION" = "7.2" -a -n "$(ls -A ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d)" ]; then
-    #  cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
-    #fi
-    #if [ "$TRAVIS_PHP_VERSION" = "7.3" -a -n "$(ls -A ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d)" ]; then
-    #  cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
-    #fi
     # it seems that www.conf exists for php 7.4 and 8.0...
     if [ -f ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf.default -a ! -f ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf ]; then
         cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
@@ -46,14 +34,14 @@ if [ -d ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d ]; then
 fi
 
 #cat ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf
-ls -la ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d
+ls -la ~/.phpenv/versions/${PHPVER}/etc/
 #cat ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
 
 # Use a unix socket for communication between apache and php-fpm - same as Ubuntu does by default
 sed -i -e "s,listen = 127.0.0.1:9000,listen = /run/php/php-fpm.sock,g" ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf
-
 sudo mkdir /run/php
 sudo chown travis:travis /run/php
+
 # @todo run php-fpm as root, and set up 'travis' as user in www.conf, instead ?
 ~/.phpenv/versions/${PHPVER}/sbin/php-fpm