diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-26 21:38:07 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-26 21:38:07 +0200 |
| commit | cfa9d239886d3fca33d7942c0ce5aa36858c014f (patch) | |
| tree | 173a53c95d3bba92c45fb035f4fa1c15aa032e3d /travis/phpunit-mysql-travis.xml | |
| parent | 5e3ce27e139342464abd182e14a69e4324d3160f (diff) | |
| parent | 502cbad5a7f8896311a616553cff9d83ccc87497 (diff) | |
| download | forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.tar forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.tar.gz forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.tar.bz2 forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.tar.xz forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12592] Add PHP 5.4 environment using mysql driver.
[ticket/12592] Rename mysql environment to mysqli.
Diffstat (limited to 'travis/phpunit-mysql-travis.xml')
| -rw-r--r-- | travis/phpunit-mysql-travis.xml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 60c279d774..21122ccaeb 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-travis.xml @@ -17,9 +17,6 @@ <exclude>../tests/functional</exclude> <exclude>../tests/lint_test.php</exclude> </testsuite> - <testsuite name="phpBB Lint Test"> - <file>../tests/lint_test.php</file> - </testsuite> <testsuite name="phpBB Functional Tests"> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> </testsuite> @@ -32,7 +29,7 @@ </groups> <php> - <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli" /> + <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysql" /> <server name="PHPBB_TEST_DBHOST" value="0.0.0.0" /> <server name="PHPBB_TEST_DBPORT" value="3306" /> <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" /> |