Commit 38d86317 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use the Akonadi test controls provided by its CMake macros

parent 865f28de
Pipeline #76386 failed with stage
in 5 minutes and 25 seconds
...@@ -74,7 +74,6 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX INCIDENCEEDITOR ...@@ -74,7 +74,6 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX INCIDENCEEDITOR
) )
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_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)
# config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING
configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-enterprise.h ) configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-enterprise.h )
......
...@@ -58,10 +58,8 @@ target_link_libraries(testindividualmaildialog ...@@ -58,10 +58,8 @@ target_link_libraries(testindividualmaildialog
KF5::IncidenceEditor KF5::IncidenceEditor
) )
if (KDEPIM_RUN_AKONADI_TEST)
# The IncidenceCategories subeditor of the dialog starts Akonadi running, so # The IncidenceCategories subeditor of the dialog starts Akonadi running, so
# set up an environment. # set up an environment.
set(AKONADI_RUN_MYSQL_ISOLATED_TESTS FALSE)
add_akonadi_isolated_test( add_akonadi_isolated_test(
SOURCE incidencedatetimetest.cpp SOURCE incidencedatetimetest.cpp
LINK_LIBRARIES Qt::Test LINK_LIBRARIES Qt::Test
...@@ -72,4 +70,3 @@ add_akonadi_isolated_test( ...@@ -72,4 +70,3 @@ add_akonadi_isolated_test(
KF5::Libkdepim KF5::Libkdepim
KF5::WidgetsAddons KF5::WidgetsAddons
) )
endif()
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment