Commit d6781e8a authored by Volker Krause's avatar Volker Krause Committed by Laurent Montel
Browse files

Cleanup Akonadi autotest controls

Those are provided by the CMake macros from Akonadi nowadays, and that's
also what the CI is using now.
parent 54f3a210
Pipeline #76401 passed with stage
in 43 minutes and 42 seconds
......@@ -5,7 +5,6 @@ set(PIM_VERSION "5.18.43")
project(Messagelib VERSION ${PIM_VERSION})
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)
option(MESSAGEVIEWER_EXPERIMENTAL_CONVERSATIONVIEW "Experimental conversationview (in progress)" FALSE)
......
......@@ -143,7 +143,8 @@ macro (ADD_GPG_CRYPTO_AKONADI_TEST _target _testname)
LD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${PATHSEP}$ENV{LD_LIBRARY_PATH}
)
set_tests_properties(${_test_name} PROPERTIES ENVIRONMENT "${_test_env}")
endif()
endif()
set_tests_properties(${_test_name} PROPERTIES RUN_SERIAL TRUE) # can't be parallelized due to gpg-agent
endif()
endif()
endfunction()
......
......@@ -92,25 +92,20 @@ add_messagecomposer_cryptotest( encryptjobtest.cpp )
add_messagecomposer_cryptotest( signencrypttest.cpp )
add_messagecomposer_cryptotest( signandencrypttest.cpp )
if (KDEPIM_RUN_AKONADI_TEST)
set(AKONADI_RUN_POSTGRES_ISOLATED_TESTS FALSE)
set(AKONADI_RUN_MYSQL_ISOLATED_TESTS FALSE)
add_executable( keyresolvertest
cryptofunctions.cpp
setupenv.cpp
keyresolvertest.cpp
)
target_link_libraries( keyresolvertest
KF5::AkonadiCore
KF5::MessageComposer
Qt::Test
)
add_gpg_crypto_akonadi_test(keyresolvertest messagecomposer-keyresolvertest)
if (NOT DEFINED AKONADI_RUN_SQLITE_ISOLATED_TESTS OR AKONADI_RUN_SQLITE_ISOLATED_TESTS)
set_tests_properties(akonadi-sqlite-messagecomposer-keyresolvertest PROPERTIES RUN_SERIAL TRUE) # can't be parallelized due to gpg-agent
endif()
endif()
set(AKONADI_RUN_POSTGRES_ISOLATED_TESTS FALSE)
set(AKONADI_RUN_MYSQL_ISOLATED_TESTS FALSE)
add_executable( keyresolvertest
cryptofunctions.cpp
setupenv.cpp
keyresolvertest.cpp
)
target_link_libraries( keyresolvertest
KF5::AkonadiCore
KF5::MessageComposer
Qt::Test
)
add_gpg_crypto_akonadi_test(keyresolvertest messagecomposer-keyresolvertest)
ecm_add_test(followupreminderselectdatedialogtest.cpp
NAME_PREFIX "messagecomposer-"
......
......@@ -39,11 +39,7 @@ endmacro ()
add_messageviewer_mailsourceviewbrowserwidget_unittest( mailsourceviewtextbrowserwidgettest.cpp )
########### viewertest_gui ###############
if (KDEPIM_RUN_AKONADI_TEST)
set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
add_akonadi_isolated_test_advanced(viewertest.cpp "" "KF5::MessageViewer;KF5::XmlGui")
add_akonadi_isolated_test_advanced(viewergrantleethemesupporttest.cpp "" "KF5::MessageViewer;KF5::XmlGui")
add_akonadi_isolated_test_advanced(urlhandlermanagertest.cpp "util.cpp" "KF5::MessageViewer;KF5::Libkleo;QGpgme;KF5::KIOCore;KF5::Mime;KF5::AkonadiCore;KF5::CalendarCore;KF5::WebEngineViewer")
endif()
add_akonadi_isolated_test_advanced(viewertest.cpp "" "KF5::MessageViewer;KF5::XmlGui")
add_akonadi_isolated_test_advanced(viewergrantleethemesupporttest.cpp "" "KF5::MessageViewer;KF5::XmlGui")
add_akonadi_isolated_test_advanced(urlhandlermanagertest.cpp "util.cpp" "KF5::MessageViewer;KF5::Libkleo;QGpgme;KF5::KIOCore;KF5::Mime;KF5::AkonadiCore;KF5::CalendarCore;KF5::WebEngineViewer")
Markdown is supported
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