From e47713d7bc99deb52e0571a0ba55d00e32b8e8e2 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 17 Aug 2017 07:37:31 +0200 Subject: [PATCH] Make execute autotest without install them --- CMakeLists.txt | 10 +++++++++- agents/archivemailagent/autotests/CMakeLists.txt | 2 +- src/autotests/CMakeLists.txt | 6 +++--- .../potentialphishingemail/autotests/CMakeLists.txt | 8 ++++---- src/folderarchive/autotests/CMakeLists.txt | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3481b4cf..ee4f6486b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,15 @@ if (POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() set(KF5_VERSION "5.37.0") -find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE) +option(RUN_UNINSTALL "test run uninstalled apps (experimental)" FALSE) + +set(ECM_VERSION ${KF5_VERSION}) +# ECM setup +if (RUN_UNINSTALL) + set(ECM_VERSION "5.38.0") +endif() + +find_package(ECM ${ECM_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(ECMOptionalAddSubdirectory) include(ECMInstallIcons) diff --git a/agents/archivemailagent/autotests/CMakeLists.txt b/agents/archivemailagent/autotests/CMakeLists.txt index cea0906bf..fa3a04069 100644 --- a/agents/archivemailagent/autotests/CMakeLists.txt +++ b/agents/archivemailagent/autotests/CMakeLists.txt @@ -7,7 +7,7 @@ macro( archivemail_agent _source) ecm_qt_declare_logging_category(_test HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent) get_filename_component( _name ${_source} NAME_WE ) add_executable( ${_name} ${_test} ) - add_test( ${_name} ${_name} ) + add_test(NAME ${_name} COMMAND ${_name} ) ecm_mark_as_test(archivemailagent-${_name}) target_link_libraries( ${_name} Qt5::Test Qt5::Core KF5::MailCommon KF5::AkonadiCore KF5::XmlGui KF5::KIOWidgets KF5::Libkdepim KF5::I18n) endmacro() diff --git a/src/autotests/CMakeLists.txt b/src/autotests/CMakeLists.txt index 1242e4405..5dc84ccd5 100644 --- a/src/autotests/CMakeLists.txt +++ b/src/autotests/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories( ########### dbus test ############### set( kmail_displaymenu_source displaymessageformatactionmenutest.cpp ../widgets/displaymessageformatactionmenu.cpp ) add_executable( displaymessageformatactionmenutest ${kmail_displaymenu_source} ) -add_test( displaymessageformatactionmenutest displaymessageformatactionmenutest ) +add_test(NAME displaymessageformatactionmenutest COMMAND displaymessageformatactionmenutest ) ecm_mark_as_test(kmail-displaymessageformatactionmenutest) target_link_libraries( displaymessageformatactionmenutest Qt5::Test KF5::MessageViewer KF5::I18n) @@ -31,13 +31,13 @@ target_link_libraries( createfollowupreminderonexistingmessagejobtest Qt5::Test set( kmail_cryptostateindicatorwidgettest_source cryptostateindicatorwidgettest.cpp ../editor/widgets/cryptostateindicatorwidget.cpp) add_executable( cryptostateindicatorwidgettest ${kmail_cryptostateindicatorwidgettest_source}) -add_test(cryptostateindicatorwidgettest cryptostateindicatorwidgettest) +add_test(NAME cryptostateindicatorwidgettest COMMAND cryptostateindicatorwidgettest) ecm_mark_as_test(cryptostateindicatorwidgettest) target_link_libraries( cryptostateindicatorwidgettest Qt5::Test KF5::MessageCore Qt5::Widgets KF5::ConfigWidgets KF5::I18n) set( kmail_kactionmenutransporttest_source kactionmenutransporttest.cpp ../widgets/kactionmenutransport.cpp) add_executable( kactionmenutransporttest ${kmail_kactionmenutransporttest_source}) -add_test(kactionmenutransporttest kactionmenutransporttest) +add_test(NAME kactionmenutransporttest COMMAND kactionmenutransporttest) ecm_mark_as_test(kactionmenutransporttest) target_link_libraries( kactionmenutransporttest Qt5::Test KF5::MailTransportAkonadi KF5::WidgetsAddons KF5::I18n KF5::ConfigGui) diff --git a/src/editor/potentialphishingemail/autotests/CMakeLists.txt b/src/editor/potentialphishingemail/autotests/CMakeLists.txt index 6dca94cd9..b5f913ad7 100644 --- a/src/editor/potentialphishingemail/autotests/CMakeLists.txt +++ b/src/editor/potentialphishingemail/autotests/CMakeLists.txt @@ -2,20 +2,20 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) set( kmail_potentialphishingemailjobtest_SRCS potentialphishingemailjobtest.cpp ../potentialphishingemailjob.cpp ) add_executable( kmail_potentialphishingemailjobtest ${kmail_potentialphishingemailjobtest_SRCS}) -add_test(kmail_potentialphishingemailjobtest kmail_potentialphishingemailjobtest) +add_test(NAME kmail_potentialphishingemailjobtest COMMAND kmail_potentialphishingemailjobtest) ecm_mark_as_test(kmail_potentialphishingemailjobtest) target_link_libraries( kmail_potentialphishingemailjobtest Qt5::Test KF5::Codecs KF5::PimCommon) set( kmail_potentialphishingdetaildialogtest_SRCS potentialphishingdetaildialogtest.cpp ../potentialphishingdetaildialog.cpp ../potentialphishingdetailwidget.cpp) add_executable( kmail_potentialphishingdetaildialogtest ${kmail_potentialphishingdetaildialogtest_SRCS}) -add_test(kmail_potentialphishingdetaildialogtest kmail_potentialphishingdetaildialogtest) +add_test(NAME kmail_potentialphishingdetaildialogtest COMMAND kmail_potentialphishingdetaildialogtest) ecm_mark_as_test(kmail_potentialphishingdetaildialogtest) target_link_libraries( kmail_potentialphishingdetaildialogtest Qt5::Test Qt5::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons) set( kmail_potentialphishingdetailwidgettest_SRCS potentialphishingdetailwidgettest.cpp ../potentialphishingdetailwidget.cpp) add_executable( kmail_potentialphishingdetailwidgettest ${kmail_potentialphishingdetailwidgettest_SRCS}) -add_test(kmail_potentialphishingdetailwidgettest kmail_potentialphishingdetailwidgettest) +add_test(NAME kmail_potentialphishingdetailwidgettest COMMAND kmail_potentialphishingdetailwidgettest) ecm_mark_as_test(kmail_potentialphishingdetailwidgettest) target_link_libraries( kmail_potentialphishingdetailwidgettest Qt5::Test Qt5::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons KF5::PimCommon) @@ -24,7 +24,7 @@ target_link_libraries( kmail_potentialphishingdetailwidgettest Qt5::Test Qt5::Wi set( kmail_potentialphishingemailwarningtest_SRCS potentialphishingemailwarningtest.cpp ../potentialphishingemailwarning.cpp ../potentialphishingdetaildialog.cpp ../potentialphishingdetailwidget.cpp) add_executable( kmail_potentialphishingemailwarningtest ${kmail_potentialphishingemailwarningtest_SRCS}) -add_test(kmail_potentialphishingemailwarningtest kmail_potentialphishingemailwarningtest) +add_test(NAME kmail_potentialphishingemailwarningtest COMMAND kmail_potentialphishingemailwarningtest) ecm_mark_as_test(kmail_potentialphishingemailwarningtest) target_link_libraries( kmail_potentialphishingemailwarningtest Qt5::Test Qt5::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons) diff --git a/src/folderarchive/autotests/CMakeLists.txt b/src/folderarchive/autotests/CMakeLists.txt index 99ee61e72..5858e273f 100644 --- a/src/folderarchive/autotests/CMakeLists.txt +++ b/src/folderarchive/autotests/CMakeLists.txt @@ -4,7 +4,7 @@ macro( folderarchive_kmail _source ) set( _test ${_source} ../folderarchiveaccountinfo.cpp ) get_filename_component( _name ${_source} NAME_WE ) add_executable( ${_name} ${_test} ) - add_test( ${_name} ${_name} ) + add_test(NAME ${_name} COMMAND ${_name} ) ecm_mark_as_test(folderararchive-${_name}) target_link_libraries( ${_name} Qt5::Test Qt5::Core KF5::AkonadiCore KF5::ConfigCore)