wilderjds
/
mailcommon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the Akonadi test controls provided by its CMake macros

Browse Source 
That's what the CI uses as well now, so we don't need the additional
local options anymore.
wilder-portage
Volker Krause 5 years ago
parent d9eaa0bdb4
commit 9267dcc93a
4 changed files with 12 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CMakeLists.txt
  2. 15
      autotests/CMakeLists.txt
  3. 2
      src/filter/autotests/CMakeLists.txt
  4. 19
      src/filter/filterimporter/autotests/CMakeLists.txt

1
CMakeLists.txt
Unescape View File

@ -91,7 +91,6 @@ set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libx
########### Targets ########### ########### Targets ###########
remove_definitions( -DQT_NO_CAST_FROM_ASCII ) remove_definitions( -DQT_NO_CAST_FROM_ASCII )
option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)

15
autotests/CMakeLists.txt
Unescape View File

@ -1,12 +1,7 @@
if (KDEPIM_RUN_AKONADI_TEST) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
add_akonadi_isolated_test(foldertreewidgettest.cpp) add_akonadi_isolated_test(foldertreewidgettest.cpp)
target_link_libraries(foldertreewidgettest KF5::Mime KF5::AkonadiWidgets KF5::MailCommon) target_link_libraries(foldertreewidgettest KF5::Mime KF5::AkonadiWidgets KF5::MailCommon)
add_akonadi_isolated_test(favoritestest.cpp)
target_link_libraries(favoritestest KF5::Mime KF5::AkonadiWidgets KF5::MailCommon)
endif()
add_akonadi_isolated_test(favoritestest.cpp)
target_link_libraries(favoritestest KF5::Mime KF5::AkonadiWidgets KF5::MailCommon)

2
src/filter/autotests/CMakeLists.txt
Unescape View File

@ -118,7 +118,6 @@ add_mailcommon_filter_test(filteractionwithaddresstest
${filter_common_SRCS} ${filter_common_SRCS}
) )
if (KDEPIM_RUN_AKONADI_TEST)
add_mailcommon_filter_akonadi_test(filteractionaddtoaddressbooktest.cpp add_mailcommon_filter_akonadi_test(filteractionaddtoaddressbooktest.cpp
filteractionaddtoaddressbooktest.cpp filteractionaddtoaddressbooktest.cpp
../filteractions/filteractionaddtoaddressbook.cpp ../filteractions/filteractionaddtoaddressbook.cpp
@ -126,7 +125,6 @@ add_mailcommon_filter_akonadi_test(filteractionaddtoaddressbooktest.cpp
../filteractions/filteractionwithstring.cpp ../filteractions/filteractionwithstring.cpp
${filter_common_SRCS} ${filter_common_SRCS}
) )
endif()
add_mailcommon_filter_test(filteractionplaysoundtest add_mailcommon_filter_test(filteractionplaysoundtest
filteractionplaysoundtest.cpp filteractionplaysoundtest.cpp

19
src/filter/filterimporter/autotests/CMakeLists.txt
Unescape View File

@ -1,13 +1,8 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
if (KDEPIM_RUN_AKONADI_TEST) add_akonadi_isolated_test_advanced(filterimportclawmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE) add_akonadi_isolated_test_advanced(filterimportthunderbirdtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE) add_akonadi_isolated_test_advanced(filterimportbalsatest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
add_akonadi_isolated_test_advanced(filterimportevolutiontest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
add_akonadi_isolated_test_advanced(filterimportclawmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n") add_akonadi_isolated_test_advanced(filterimportprocmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
add_akonadi_isolated_test_advanced(filterimportthunderbirdtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n") add_akonadi_isolated_test_advanced(filterimportsylpheedtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
add_akonadi_isolated_test_advanced(filterimportbalsatest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n") add_akonadi_isolated_test_advanced(filterimportergmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
add_akonadi_isolated_test_advanced(filterimportevolutiontest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
add_akonadi_isolated_test_advanced(filterimportprocmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
add_akonadi_isolated_test_advanced(filterimportsylpheedtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
add_akonadi_isolated_test_advanced(filterimportergmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;KF5::MessageComposer;KF5::I18n")
endif()

Write Preview
Loading…
Cancel
Save