diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-03-13 13:33:09 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-03-13 13:33:09 +0100 |
| commit | a8eb7a5092fad987b96f9dac947dc9bf4a2b0eaf (patch) | |
| tree | c67097757d652036750c67358c631a78d4fdfc3b /lib | |
| parent | 612b52abc528009349cdfd323caed8dda4d21163 (diff) | |
| download | nextcloud-server-a8eb7a5092fad987b96f9dac947dc9bf4a2b0eaf.tar.gz nextcloud-server-a8eb7a5092fad987b96f9dac947dc9bf4a2b0eaf.zip | |
Allow setting the config dir to use as enviroment variable for phpunit
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 86ee5349828..2d4a9f92764 100644 --- a/lib/base.php +++ b/lib/base.php @@ -103,7 +103,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/'; |