From 462839d39fd99637fef5f0ca32e615e69ca9ef2b Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Thu, 24 Jul 2014 10:46:10 -0700 Subject: [PATCH] Replace HHVM's built-in webserver with Nginx for continuous integration tests --- tests/PHPCurlClass/server.hdf | 7 ------- tests/before_script.sh | 11 ++++++++++- 2 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 tests/PHPCurlClass/server.hdf diff --git a/tests/PHPCurlClass/server.hdf b/tests/PHPCurlClass/server.hdf deleted file mode 100644 index 8e49d88..0000000 --- a/tests/PHPCurlClass/server.hdf +++ /dev/null @@ -1,7 +0,0 @@ -Log { - Level = Verbose -} - -Server { - DefaultDocument = index.php -} diff --git a/tests/before_script.sh b/tests/before_script.sh index b962158..9dae6d3 100644 --- a/tests/before_script.sh +++ b/tests/before_script.sh @@ -5,5 +5,14 @@ elif [[ "${TRAVIS_PHP_VERSION}" == "5.5" ]]; then elif [[ "${TRAVIS_PHP_VERSION}" == "5.6" ]]; then php -S 127.0.0.1:8000 -t tests/PHPCurlClass/ & elif [[ "${TRAVIS_PHP_VERSION}" == "hhvm" ]]; then - cd tests && hhvm --mode server --port 8000 --config PHPCurlClass/server.hdf & + sudo add-apt-repository -y ppa:nginx/stable + sudo apt-get update + sudo apt-get install -y nginx + sudo /usr/share/hhvm/install_fastcgi.sh + root="$(pwd)/tests/PHPCurlClass" + root="${root//\//\\/}" + sudo sed --in-place --regexp-extended 's/listen 80 default_server;/listen 8000 default_server;/' /etc/nginx/sites-enabled/default + sudo sed --in-place --regexp-extended "s/root \/usr\/share\/nginx\/html;/root ${root};/" /etc/nginx/sites-enabled/default + sudo sed --in-place --regexp-extended 's/index index.html index.htm;/index index.php;/' /etc/nginx/sites-enabled/default + sudo /etc/init.d/nginx restart fi