another attempt at travis

diff --git a/.travis.yml b/.travis.yml
index 6ea8d32..0393732 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ before_script:
   - ./test/ci/travis/setup_privoxy.sh
 
 script:
-  php -d "include_path=.:./lib:./test" test/testsuite.php LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1 NOPROXY=1
+  php -d "include_path=.:./lib:./test" test/testsuite.php LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1
 
 after_failure:
   # Save as much info as we can to help developers

diff --git a/test/ci/travis/setup_php_fpm.sh b/test/ci/travis/setup_php_fpm.sh
index 7788fdc..21ad19e 100755 (executable)
--- a/test/ci/travis/setup_php_fpm.sh
+++ b/test/ci/travis/setup_php_fpm.sh
@@ -8,4 +8,5 @@ if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv ve
 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
 ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm