diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-09-14 16:25:59 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2018-09-14 16:25:59 +0300 |
| commit | 0290564d5c654d654856f04f1b04bad984f36aee (patch) | |
| tree | 3b9a5eda39861d9467bc130a00e7effbc4ef7b6c /test/CMakeLists.txt | |
| parent | 638f5c8752164ccc0429b1df60b79c3d3293bcd4 (diff) | |
| parent | 3a335879fa1f00f094d82855126fec3f6ab59405 (diff) | |
Merge remote-tracking branch 'owncloud/master' into delta-sync
Conflicts:
.gitmodules
src/cmd/cmd.cpp
src/gui/generalsettings.ui
src/libsync/propagatedownload.cpp
src/libsync/propagateuploadng.cpp
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d6a99c67d..71a38b4c4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -40,16 +40,21 @@ owncloud_add_test(ChecksumValidator "") owncloud_add_test(ExcludedFiles "") -owncloud_add_test(FileSystem "") owncloud_add_test(Utility "") owncloud_add_test(SyncEngine "syncenginetestutils.h") +owncloud_add_test(SyncVirtualFiles "syncenginetestutils.h") owncloud_add_test(SyncMove "syncenginetestutils.h") owncloud_add_test(SyncConflict "syncenginetestutils.h") owncloud_add_test(SyncFileStatusTracker "syncenginetestutils.h") +owncloud_add_test(Download "syncenginetestutils.h") owncloud_add_test(ChunkingNg "syncenginetestutils.h") owncloud_add_test(Zsync "syncenginetestutils.h") owncloud_add_test(UploadReset "syncenginetestutils.h") owncloud_add_test(AllFilesDeleted "syncenginetestutils.h") +owncloud_add_test(Blacklist "syncenginetestutils.h") +owncloud_add_test(LocalDiscovery "syncenginetestutils.h") +owncloud_add_test(RemoteDiscovery "syncenginetestutils.h") +owncloud_add_test(Permissions "syncenginetestutils.h") owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}") if( UNIX AND NOT APPLE ) @@ -66,6 +71,8 @@ list(APPEND FolderMan_SRC ../src/gui/syncrunfilelog.cpp ) list(APPEND FolderMan_SRC ../src/gui/lockwatcher.cpp ) list(APPEND FolderMan_SRC ../src/gui/guiutility.cpp ) list(APPEND FolderMan_SRC ../src/gui/navigationpanehelper.cpp ) +list(APPEND FolderMan_SRC ../src/gui/connectionvalidator.cpp ) +list(APPEND FolderMan_SRC ../src/gui/clientproxy.cpp ) list(APPEND FolderMan_SRC ${FolderWatcher_SRC}) list(APPEND FolderMan_SRC stub.cpp ) owncloud_add_test(FolderMan "${FolderMan_SRC}") |