aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/functional/search_sphinx_test.php5
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php5
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/functional/search_sphinx_test.php b/tests/functional/search_sphinx_test.php
index c70ea04715..6b94f388c4 100644
--- a/tests/functional/search_sphinx_test.php
+++ b/tests/functional/search_sphinx_test.php
@@ -20,6 +20,9 @@ class phpbb_functional_search_sphinx_test extends phpbb_functional_search_test
{
parent::setUp();
$this->search_backend = 'phpbb_search_fulltext_sphinx';
- $this->markTestIncomplete('Sphinx search not running for the test board');
+ if (!isset($config['fulltext_sphinx_id']))
+ {
+ $this->markTestIncomplete('Sphinx search not running for the test board');
+ }
}
}
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 351a3a9594..2f225fe7af 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -158,6 +158,11 @@ class phpbb_test_case_helpers
{
$config['redis_port'] = $phpbb_redis_port;
}
+
+ if (isset($fulltext_sphinx_id))
+ {
+ $config['fulltext_sphinx_id'] = $fulltext_sphinx_id;
+ }
}
if (isset($_SERVER['PHPBB_TEST_DBMS']))