Use the Akonadi test controls provided by its CMake macros

CMakeLists.txt

@@ -60,7 +60,6 @@ set(KDEPIM_LIB_SOVERSION "5")
 set(QT_REQUIRED_VERSION "5.15.2")
 option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
 
-option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
 set(LIBGRAVATAR_VERSION "5.18.40")

agents/unifiedmailboxagent/autotests/CMakeLists.txt

@@ -7,9 +7,7 @@ add_definitions(-DUNIT_TESTS)
 kconfig_add_kcfg_files(unifiedmailbox_agent_autotest_SRCS
     ../settings.kcfgc
 )
-if (KDEPIM_RUN_AKONADI_TEST)
 add_akonadi_isolated_test(SOURCE unifiedmailboxmanagertest.cpp
     ADDITIONAL_SOURCES ${common_SRCS} ../unifiedmailboxmanager.cpp ../unifiedmailbox.cpp ${unifiedmailbox_agent_autotest_SRCS}
     LINK_LIBRARIES KF5::I18n KF5::AkonadiMime KF5::ConfigGui
 )
-endif()

src/autotests/CMakeLists.txt

@@ -34,15 +34,11 @@ add_test(NAME kactionmenutransporttest COMMAND kactionmenutransporttest)
 ecm_mark_as_test(kactionmenutransporttest)
 target_link_libraries( kactionmenutransporttest Qt::Test  KF5::MailTransportAkonadi KF5::WidgetsAddons KF5::I18n KF5::ConfigGui kmailprivate)
 
-if (KDEPIM_RUN_AKONADI_TEST)
-    set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
-    set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
 
-    add_akonadi_isolated_test_advanced( kmcomposerwintest.cpp ""
+add_akonadi_isolated_test_advanced( kmcomposerwintest.cpp ""
     "Qt::Test;KF5::IdentityManagement;KF5::MessageCore;KF5::TemplateParser;KF5::XmlGui;Qt::Widgets;KF5::ConfigWidgets;KF5::I18n;kmailprivate")
 
-    add_akonadi_isolated_test_advanced( tagselectdialogtest.cpp  "" "kmailprivate;KF5::MailCommon;KF5::Libkdepim;KF5::ItemViews;KF5::TemplateParser;KF5::XmlGui;KF5::Completion;KF5::I18n")
+add_akonadi_isolated_test_advanced( tagselectdialogtest.cpp  "" "kmailprivate;KF5::MailCommon;KF5::Libkdepim;KF5::ItemViews;KF5::TemplateParser;KF5::XmlGui;KF5::Completion;KF5::I18n")
 
-    add_akonadi_isolated_test_advanced(kmcommandstest.cpp ""
-	"Qt::Test;Qt::Widgets;KF5::AkonadiCore;KF5::Bookmarks;KF5::ConfigWidgets;KF5::Contacts;KF5::I18n;KF5::IdentityManagement;KF5::KIOCore;KF5::KIOFileWidgets;KF5::MessageCore;KF5::MessageComposer;KF5::MessageList;KF5::MessageViewer;KF5::MailCommon;KF5::MailTransportAkonadi;KF5::Libkdepim;KF5::TemplateParser;kmailprivate")
-endif()
+add_akonadi_isolated_test_advanced(kmcommandstest.cpp ""
+    "Qt::Test;Qt::Widgets;KF5::AkonadiCore;KF5::Bookmarks;KF5::ConfigWidgets;KF5::Contacts;KF5::I18n;KF5::IdentityManagement;KF5::KIOCore;KF5::KIOFileWidgets;KF5::MessageCore;KF5::MessageComposer;KF5::MessageList;KF5::MessageViewer;KF5::MailCommon;KF5::MailTransportAkonadi;KF5::Libkdepim;KF5::TemplateParser;kmailprivate")