mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7714 from owncloud/phpunit-config 

Allow setting the config dir to use as enviroment variable for phpunit
This commit is contained in:
icewind1991 2014-03-24 13:01:37 +01:00
parent abdc823bb6 a8eb7a5092
commit 4c8a83e82f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base.php
View File

@ -98,7 +98,9 @@ class OC {
get_include_path()
);
if(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
if(defined('PHPUNIT_CONFIG_DIR')) {
self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
} elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
self::$configDir = OC::$SERVERROOT . '/tests/config/';
} else {
self::$configDir = OC::$SERVERROOT . '/config/';

9
tests/bootstrap.php
View File

@ -3,9 +3,14 @@
define('PHPUNIT_RUN', 1);
require_once __DIR__.'/../lib/base.php';
$configDir = getenv('CONFIG_DIR');
if ($configDir) {
define('PHPUNIT_CONFIG_DIR', $configDir);
}
if(!class_exists('PHPUnit_Framework_TestCase')) {
require_once __DIR__ . '/../lib/base.php';
if (!class_exists('PHPUnit_Framework_TestCase')) {
require_once('PHPUnit/Autoload.php');
}