diff options
| author | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-02-10 17:12:03 +0300 |
|---|---|---|
| committer | Jocelyn Turcotte <jturcotte@woboq.com> | 2017-02-14 16:32:41 +0300 |
| commit | 60a4a742a311fdd3d4e0f871ab3e6a42fbb0880d (patch) | |
| tree | 76b407c03cf0f647e138134874bbe8071cb2b452 /test/CMakeLists.txt | |
| parent | b26db062d23a54357695522680b196d0ad89558b (diff) | |
Disable tests uncompatible with Qt4 for that build
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 92363ea7a..16b4b6589 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,7 +9,6 @@ setup_qt() include(owncloud_add_test.cmake) owncloud_add_test(OwncloudPropagator "") -owncloud_add_test(Utility "") owncloud_add_test(Updater "") SET(FolderWatcher_SRC ../src/gui/folderwatcher.cpp) @@ -24,31 +23,29 @@ IF( APPLE ) list(APPEND FolderWatcher_SRC ../src/gui/folderwatcher_mac.cpp) list(APPEND FolderWatcher_SRC ../src/gui/socketapisocket_mac.mm) ENDIF() - -owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}") -if( UNIX AND NOT APPLE ) - if(HAVE_QT5 AND NOT BUILD_WITH_QT4) - owncloud_add_test(InotifyWatcher "${FolderWatcher_SRC}") - endif(HAVE_QT5 AND NOT BUILD_WITH_QT4) -endif(UNIX AND NOT APPLE) - owncloud_add_test(CSyncSqlite "") owncloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp) owncloud_add_test(OwnSql "") owncloud_add_test(SyncJournalDB "") owncloud_add_test(SyncFileItem "") owncloud_add_test(ConcatUrl "") - owncloud_add_test(XmlParse "") -owncloud_add_test(FileSystem "") owncloud_add_test(ChecksumValidator "") owncloud_add_test(ExcludedFiles "") if(HAVE_QT5 AND NOT BUILD_WITH_QT4) + owncloud_add_test(FileSystem "") + owncloud_add_test(Utility "") owncloud_add_test(SyncEngine "syncenginetestutils.h") owncloud_add_test(SyncFileStatusTracker "syncenginetestutils.h") owncloud_add_test(ChunkingNg "syncenginetestutils.h") owncloud_add_test(UploadReset "syncenginetestutils.h") + owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}") + + if( UNIX AND NOT APPLE ) + owncloud_add_test(InotifyWatcher "${FolderWatcher_SRC}") + endif(UNIX AND NOT APPLE) + owncloud_add_benchmark(LargeSync "syncenginetestutils.h") endif(HAVE_QT5 AND NOT BUILD_WITH_QT4) @@ -60,8 +57,5 @@ list(APPEND FolderMan_SRC ../src/gui/syncrunfilelog.cpp ) list(APPEND FolderMan_SRC ../src/gui/lockwatcher.cpp ) list(APPEND FolderMan_SRC ${FolderWatcher_SRC}) list(APPEND FolderMan_SRC stub.cpp ) -#include_directories(${QTKEYCHAIN_INCLUDE_DIR}) -#include_directories(${CMAKE_BINARY_DIR}/src/gui) -#include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qjson) owncloud_add_test(FolderMan "${FolderMan_SRC}") |