aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-03-24 14:52:50 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-03-24 14:52:50 +0100
commit9c85c6c318d71ec6dc626f227a5a4579330996c2 (patch)
tree4d89d547f08618238e03ba1288d2b7d55f3cbe7e
parent57eb50812f138296085b51b74079037c2efe1c43 (diff)
parent5bcdfe94dd487441565c00450b3a8efcaeecd840 (diff)
downloadforums-9c85c6c318d71ec6dc626f227a5a4579330996c2.tar
forums-9c85c6c318d71ec6dc626f227a5a4579330996c2.tar.gz
forums-9c85c6c318d71ec6dc626f227a5a4579330996c2.tar.bz2
forums-9c85c6c318d71ec6dc626f227a5a4579330996c2.tar.xz
forums-9c85c6c318d71ec6dc626f227a5a4579330996c2.zip
Merge remote-tracking branch 'unknownbliss/ticket/10723' into develop-olympus
* unknownbliss/ticket/10723: [ticket/10723] Stop Travis running all tests on sqlite
-rw-r--r--travis/phpunit-mysql-travis.xml14
-rw-r--r--travis/phpunit-postgres-travis.xml14
2 files changed, 14 insertions, 14 deletions
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index 79215c8de1..36845a7f71 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -23,12 +23,12 @@
</groups>
<php>
- <const name="dbms" value="mysqli"/>
- <const name="dbhost" value="0.0.0.0" />
- <const name="dbport" value="3306" />
- <const name="dbname" value="phpbb_tests" />
- <const name="dbuser" value="root" />
- <const name="dbpasswd" value="" />
- <const name="table_prefix" value="phpbb_"/>
+ <server name="PHPBB_TEST_DBMS" value="mysqli" />
+ <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" />
+ <server name="PHPBB_TEST_DBUSER" value="root" />
+ <server name="PHPBB_TEST_DBPASSWD" value="" />
+ <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
</php>
</phpunit>
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 02db76ae78..461a53bcb1 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -25,12 +25,12 @@
<php>
<!-- "Real" test database -->
<!-- uncomment, otherwise sqlite memory runs -->
- <const name="dbms" value="postgres"/>
- <const name="dbhost" value="localhost" />
- <const name="dbport" value="5432" />
- <const name="dbname" value="phpbb_tests" />
- <const name="dbuser" value="postgres" />
- <const name="dbpasswd" value="" />
- <const name="table_prefix" value="phpbb_"/>
+ <server name="PHPBB_TEST_DBMS" value="postgres"/>
+ <server name="PHPBB_TEST_DBHOST" value="localhost" />
+ <server name="PHPBB_TEST_DBPORT" value="5432" />
+ <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
+ <server name="PHPBB_TEST_DBUSER" value="postgres" />
+ <server name="PHPBB_TEST_DBPASSWD" value="" />
+ <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
</php>
</phpunit>