diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-13 20:08:49 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-13 20:08:49 +0200 |
| commit | 92d17cbff3800488deb52bd2088f418f2da44458 (patch) | |
| tree | b0084389fd708f862af7e1a9cadce373c410373a /tests/test_framework/phpbb_test_case_helpers.php | |
| parent | f81e8e9901ae64655cfd4d1c3ee1501bf5a13d09 (diff) | |
| parent | 725db1ba29960aa8ad2a24c7324078c69c6c8ced (diff) | |
| download | forums-92d17cbff3800488deb52bd2088f418f2da44458.tar forums-92d17cbff3800488deb52bd2088f418f2da44458.tar.gz forums-92d17cbff3800488deb52bd2088f418f2da44458.tar.bz2 forums-92d17cbff3800488deb52bd2088f418f2da44458.tar.xz forums-92d17cbff3800488deb52bd2088f418f2da44458.zip | |
Merge remote-tracking branch 'p/ticket/10891' into develop-olympus
* p/ticket/10891:
[ticket/10891] Allow specifying test_config.php path via environment.
Conflicts:
tests/RUNNING_TESTS.txt
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index b46c36efaa..2a3c27f9f9 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -58,9 +58,19 @@ class phpbb_test_case_helpers )); } - if (file_exists(dirname(__FILE__) . '/../test_config.php')) + if (isset($_SERVER['PHPBB_TEST_CONFIG'])) { - include(dirname(__FILE__) . '/../test_config.php'); + // Could be an absolute path + $test_config = $_SERVER['PHPBB_TEST_CONFIG']; + } + else + { + $test_config = dirname(__FILE__) . '/../test_config.php'; + } + + if (file_exists($test_config)) + { + include($test_config); $config = array_merge($config, array( 'dbms' => $dbms, |