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
This commit is contained in:
Andreas Fischer 2012-05-13 20:08:49 +02:00
commit 92d17cbff3
2 changed files with 18 additions and 2 deletions

View file

@ -37,6 +37,12 @@ options can be found on the wiki (see below).
$dbuser = 'user';
$dbpasswd = 'password';
It is possible to have multiple test_config.php files, for example if you
are testing on multiple databases. You can specify which test_config.php file
to use in the environment as follows:
$ PHPBB_TEST_CONFIG=tests/test_config.php phpunit
Alternatively you can specify parameters in the environment, so e.g. the
following will run phpunit with the same parameters as in the shown
test_config.php file:

View file

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