diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 10:46:50 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-30 10:46:50 +0200 |
commit | e3dee633393514402bc828e90b493d5168fdf837 (patch) | |
tree | 576e0d81276f8b498b511909ca5ad76e0b208223 /tests/phpunit.xml.dist | |
parent | 1ec7dff2fe1922a4690dc2537c0c64369ca86ea1 (diff) | |
parent | 5899485ca17045e93528c29d1ed63b02192c4191 (diff) | |
download | nextcloud-server-e3dee633393514402bc828e90b493d5168fdf837.tar.gz nextcloud-server-e3dee633393514402bc828e90b493d5168fdf837.zip |
Merge branch 'master' into fixing-4011-master
Conflicts:
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
Diffstat (limited to 'tests/phpunit.xml.dist')
-rw-r--r-- | tests/phpunit.xml.dist | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist index 25dfc64cfeb..71a4ff2762c 100644 --- a/tests/phpunit.xml.dist +++ b/tests/phpunit.xml.dist @@ -11,7 +11,21 @@ <directory suffix=".php">..</directory> <exclude> <directory suffix=".php">../3rdparty</directory> + <directory suffix=".php">../apps/files/l10n</directory> + <directory suffix=".php">../apps/files_external/l10n</directory> + <directory suffix=".php">../apps/files_external/3rdparty</directory> + <directory suffix=".php">../apps/files_versions/l10n</directory> + <directory suffix=".php">../apps/files_encryption/l10n</directory> + <directory suffix=".php">../apps/files_encryption/3rdparty</directory> + <directory suffix=".php">../apps/files_sharing/l10n</directory> + <directory suffix=".php">../apps/files_trashbin/l10n</directory> + <directory suffix=".php">../apps/user_ldap/l10n</directory> + <directory suffix=".php">../apps/user_webdavauth/l10n</directory> <directory suffix=".php">../lib/MDB2</directory> + <directory suffix=".php">../lib/l10n</directory> + <directory suffix=".php">../core/l10n</directory> + <directory suffix=".php">../settings/l10n</directory> + <directory suffix=".php">../tests</directory> </exclude> </whitelist> </filter> |