diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-13 20:09:00 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-13 20:09:00 +0200 |
| commit | 2715fc5bdf1f922f5c4764dd3c60aba06901a248 (patch) | |
| tree | 32cb9a67fbaf9306d036bae2449ad04034bf5c44 /tests/test_framework | |
| parent | 8f41533421baddce9868e47e837115f93d23adb2 (diff) | |
| parent | 92d17cbff3800488deb52bd2088f418f2da44458 (diff) | |
| download | forums-2715fc5bdf1f922f5c4764dd3c60aba06901a248.tar forums-2715fc5bdf1f922f5c4764dd3c60aba06901a248.tar.gz forums-2715fc5bdf1f922f5c4764dd3c60aba06901a248.tar.bz2 forums-2715fc5bdf1f922f5c4764dd3c60aba06901a248.tar.xz forums-2715fc5bdf1f922f5c4764dd3c60aba06901a248.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10891] Allow specifying test_config.php path via environment.
Diffstat (limited to 'tests/test_framework')
| -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 9c91778cb0..329af2c537 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -63,9 +63,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, |