aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2013-01-22 19:25:15 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2013-01-22 19:25:15 -0500
commit722181bc3b438bb528d141c3ec19fdba2315f2ef (patch)
treed452fe3d7dcd774fd4494da4b0fec24337a8ce34
parentd377a25f239ec67a7e74cced9c69588ff0537d05 (diff)
parentaa7350eba731496e11956b78d99d57aeaafaad58 (diff)
downloadforums-722181bc3b438bb528d141c3ec19fdba2315f2ef.tar
forums-722181bc3b438bb528d141c3ec19fdba2315f2ef.tar.gz
forums-722181bc3b438bb528d141c3ec19fdba2315f2ef.tar.bz2
forums-722181bc3b438bb528d141c3ec19fdba2315f2ef.tar.xz
forums-722181bc3b438bb528d141c3ec19fdba2315f2ef.zip
Merge PR #1202 branch 'bantu/ticket/11338' into develop
# By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11338: [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run.
-rw-r--r--travis/phpunit-mysql-travis.xml1
-rw-r--r--travis/phpunit-postgres-travis.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index cc033ff959..f5f1aa2417 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -34,6 +34,7 @@
<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_REDIS_HOST" value="localhost" />
<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 5019c225b4..a202ec4a36 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -36,6 +36,7 @@
<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_REDIS_HOST" value="localhost" />
<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
</php>
</phpunit>