diff options
| author | icewind1991 <robin@icewind.nl> | 2014-03-24 13:01:37 +0100 |
|---|---|---|
| committer | icewind1991 <robin@icewind.nl> | 2014-03-24 13:01:37 +0100 |
| commit | 4c8a83e82fe4dfe5b83e09194060ecbf44f44791 (patch) | |
| tree | 2880ab34bbd9696cff7dadc2d79608d1afb4628e /lib | |
| parent | abdc823bb69600c3a4fc23e09f9de5819b57f56e (diff) | |
| parent | a8eb7a5092fad987b96f9dac947dc9bf4a2b0eaf (diff) | |
| download | nextcloud-server-4c8a83e82fe4dfe5b83e09194060ecbf44f44791.tar.gz nextcloud-server-4c8a83e82fe4dfe5b83e09194060ecbf44f44791.zip | |
Merge pull request #7714 from owncloud/phpunit-config
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 cc710fc7207..2515b9657cb 100644 --- a/lib/base.php +++ b/lib/base.php @@ -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/'; |