X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fci%2Ftravis%2Fsetup_php_fpm.sh;h=c2f34c0f9f57f065bf326ec0c4fa031c541c84fb;hb=2f7766920d2ff763d9472934e811cfe868f74a2c;hp=3b9ac22a2e2b64677bce676f580a092c3bc06162;hpb=00b81fc25db18f8b1a6f38c5534f3928991df573;p=plcapi.git

diff --git a/test/ci/travis/setup_php_fpm.sh b/test/ci/travis/setup_php_fpm.sh
index 3b9ac22..c2f34c0 100755
--- a/test/ci/travis/setup_php_fpm.sh
+++ b/test/ci/travis/setup_php_fpm.sh
@@ -6,7 +6,12 @@ sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.ph
 if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then
   sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
 fi
-echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-echo "always_populate_raw_post_data = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-echo "include_path = '.:/home/travis/lib'" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+if [ "$TRAVIS_PHP_VERSION" = "7.1" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then
+  sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
+fi
+
+echo "cgi.fix_pathinfo = 1" > ~/.phpenv/versions/$(phpenv version-name)/etc/zzz_testconfig.ini
+echo "always_populate_raw_post_data = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/zzz_testconfig.ini
+echo "include_path = '.:$(pwd)/lib'" >> ~/.phpenv/versions/$(phpenv version-name)/etc/zzz_testconfig.ini
+
 ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm