diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-24 01:10:06 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-24 01:10:06 -0500 |
| commit | 229d1092f8c18075ad03c6d67dd78707cbf1b421 (patch) | |
| tree | 9d6c2636b3ba63b496fbfaa1b53c3dc9552fa02c /travis/phpunit-postgres-travis.xml | |
| parent | 9a0992f6a0618d8423d15db7fd7780fdfd4c1670 (diff) | |
| parent | 4b9c163969cfffc302780d48015453a3ce472dca (diff) | |
| download | forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.tar forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.tar.gz forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.tar.bz2 forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.tar.xz forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.zip | |
Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11337:
[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.
Diffstat (limited to 'travis/phpunit-postgres-travis.xml')
| -rw-r--r-- | travis/phpunit-postgres-travis.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index 0383edd9d6..12e20547ba 100644 --- 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> @@ -37,5 +37,6 @@ <server name="PHPBB_TEST_DBUSER" value="postgres" /> <server name="PHPBB_TEST_DBPASSWD" value="" /> <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/> + <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" /> </php> </phpunit> |