Merge PR phpbb#1201 branch 'develop-olympus' into develop

* develop-olympus: [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm. Conflicts: .travis.yml
cancurve · Jan 24, 2013 · 01607be · 01607be
2 parents ec97e60 + 229d109
commit 01607be
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,8 @@ before_script:
   - phpenv rehash
   - cd phpBB
   - php ../composer.phar install --dev
-  - cd ../
+  - cd ..
+  - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
 
 script:
   - phpunit --configuration travis/phpunit-$DB-travis.xml

diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
@@ -17,7 +17,7 @@
 			<exclude>tests/functional</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
 	</testsuites>
 
@@ -36,5 +36,6 @@
 		<server name="PHPBB_TEST_DBPASSWD" value="" />
 		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
 		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
 	</php>
 </phpunit>
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
@@ -17,7 +17,7 @@
 			<exclude>tests/functional</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
 	</testsuites>
 
@@ -38,5 +38,6 @@
 		<server name="PHPBB_TEST_DBPASSWD" value="" />
 		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
 		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
 	</php>
 </phpunit>
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# @copyright (c) 2013 phpBB Group
+# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+#
+set -e
+
+sudo apt-get update -qq
+sudo apt-get install -qq nginx realpath
+
+sudo service nginx stop
+
+DIR=$(dirname "$0")
+PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB")
+
+NGINX_CONF="/etc/nginx/sites-enabled/default"
+
+PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm"
+PHP_FPM_CONF="$DIR/php-fpm.conf"
+PHP_FPM_SOCK=$(realpath "$DIR")/php-fpm.sock
+
+USER=$(whoami)
+
+# php-fpm configuration
+echo "
+[global]
+
+[travis]
+user = $USER
+group = $USER
+listen = $PHP_FPM_SOCK
+pm = static
+pm.max_children = 2
+
+php_admin_value[memory_limit] = 128M
+" > $PHP_FPM_CONF
+
+# nginx configuration
+echo "
+server {
+	listen	80;
+	root	$PHPBB_ROOT_PATH/;
+	index	index.php index.html;
+
+	location ~ \.php$ {
+		fastcgi_pass	unix:$PHP_FPM_SOCK;
+		include			fastcgi_params;
+	}
+}
+" | sudo tee $NGINX_CONF > /dev/null
+
+# Start daemons
+sudo $PHP_FPM_BIN --fpm-config "$DIR/php-fpm.conf"
+sudo service nginx start