diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-11-06 18:17:39 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2018-11-06 18:17:51 +0300 |
| commit | 9b874c276483b4c68afed78cce7f74cee4c2333c (patch) | |
| tree | 96ab9d904ab24cf7d8a5490a9181f9131a760523 /test/CMakeLists.txt | |
| parent | 4b47fda7f664c9f6b223f072bbb9aadff8051978 (diff) | |
| parent | c674d3957679bc88fd5c09647fe017f6411de595 (diff) | |
Merge remote-tracking branch 'origin/2.5' into master
Conflicts:
src/libsync/propagateuploadng.cpp
test/CMakeLists.txt
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1f078a665..1a26ace2e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -56,6 +56,8 @@ owncloud_add_test(LocalDiscovery "syncenginetestutils.h") owncloud_add_test(RemoteDiscovery "syncenginetestutils.h") owncloud_add_test(Permissions "syncenginetestutils.h") owncloud_add_test(SelectiveSync "syncenginetestutils.h") +owncloud_add_test(LockedFiles "syncenginetestutils.h;../src/gui/lockwatcher.cpp") + owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}") if( UNIX AND NOT APPLE ) |