summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-01-20 13:41:52 +0100
committerRobin Appelman <icewind@owncloud.com>2014-01-20 13:41:52 +0100
commit164915a3f8c420b4274ebf3841044f18ca7435a4 (patch)
tree07bab8dcda126c81a2865657dd4851d2f11fa3bc /lib
parent6b4c3df0876a4786bbde406349746600c87e1e6b (diff)
downloadnextcloud-server-164915a3f8c420b4274ebf3841044f18ca7435a4.tar.gz
nextcloud-server-164915a3f8c420b4274ebf3841044f18ca7435a4.zip
Move test config folder to tests/config
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index d320f6f2411..0597183adcf 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -103,8 +103,8 @@ class OC {
get_include_path()
);
- if(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/test_config/')) {
- self::$configDir = OC::$SERVERROOT . '/test_config/';
+ if(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/';
}