4 files changed, 23 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99d7a41..c53075d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ find_package(ECM 0.0.10 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH
         ${ECM_MODULE_PATH}
         ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
+        ${CMAKE_CURRENT_SOURCE_DIR}/tests
         ${CMAKE_MODULE_PATH})
 
 include(FeatureSummary)
diff --git a/examples/imapresource/tests/CMakeLists.txt b/examples/imapresource/tests/CMakeLists.txt
index b10adcd..0604b91 100644
--- a/examples/imapresource/tests/CMakeLists.txt
+++ b/examples/imapresource/tests/CMakeLists.txt
@@ -1,17 +1,9 @@
 set(CMAKE_AUTOMOC ON)
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
-    )
+)
 
-macro(auto_tests)
-    foreach(_testname ${ARGN})
-        add_executable(${_testname} ${_testname}.cpp)
-        # generate_flatbuffers(${_testname} calendar)
-        add_test(${_testname} ${_testname})
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sink libhawd)
-    endforeach(_testname)
-endmacro(auto_tests)
+include(SinkTest)
 
 auto_tests (
     imapresourcetest
@@ -20,6 +12,6 @@ auto_tests (
 )
 target_link_libraries(imapresourcetest sink_resource_imap)
 target_link_libraries(imapserverproxytest sink_resource_imap)
-target_link_libraries(imapmailtest sink_test sink_resource_imap)
+target_link_libraries(imapmailtest sink_resource_imap)
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resetmailbox.sh DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9de6ffa..7146220 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,24 +16,7 @@ add_library(sink_test SHARED testimplementations.cpp getrssusage.cpp mailtest.cp
 qt5_use_modules(sink_test Core Test Concurrent)
 target_link_libraries(sink_test sink libhawd KF5::Mime)
 
-macro(manual_tests)
-    foreach(_testname ${ARGN})
-        add_executable(${_testname} ${_testname}.cpp)
-        generate_flatbuffers(${_testname} calendar)
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sink libhawd sink_test)
-    endforeach(_testname)
-endmacro(manual_tests)
-
-macro(auto_tests)
-    foreach(_testname ${ARGN})
-        add_executable(${_testname} ${_testname}.cpp)
-        generate_flatbuffers(${_testname} calendar)
-        add_test(${_testname} ${_testname})
-        qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sink libhawd  sink_test)
-    endforeach(_testname)
-endmacro(auto_tests)
+include(SinkTest)
 
 manual_tests (
     storagebenchmark
@@ -64,6 +47,7 @@ auto_tests (
     accountstest
     testaccounttest
 )
+generate_flatbuffers(dummyresourcetest calendar)
 target_link_libraries(dummyresourcetest sink_resource_dummy)
 target_link_libraries(dummyresourcebenchmark sink_resource_dummy)
 target_link_libraries(dummyresourcewritebenchmark sink_resource_dummy)
diff --git a/tests/SinkTest.cmake b/tests/SinkTest.cmake
new file mode 100644
index 0000000..efc1273
--- /dev/null
+++ b/tests/SinkTest.cmake
@@ -0,0 +1,17 @@
+
+macro(auto_tests)
+    foreach(_testname ${ARGN})
+        add_executable(${_testname} ${_testname}.cpp)
+        add_test(${_testname} ${_testname})
+        qt5_use_modules(${_testname} Core Test Concurrent)
+        target_link_libraries(${_testname} sink libhawd sink_test)
+    endforeach(_testname)
+endmacro(auto_tests)
+
+macro(manual_tests)
+    foreach(_testname ${ARGN})
+        add_executable(${_testname} ${_testname}.cpp)
+        qt5_use_modules(${_testname} Core Test Concurrent)
+        target_link_libraries(${_testname} sink libhawd sink_test)
+    endforeach(_testname)
+endmacro(manual_tests)