mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 17:27:16 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10891] Allow specifying test_config.php path via environment.
This commit is contained in:
Andreas Fischer
2012-05-13 20:09:00 +02:00
parent 8f41533421 92d17cbff3
commit 2715fc5bdf
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test_framework/phpbb_test_case_helpers.php
View File

@@ -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,