CMake: Allow extra libraries in calamares_add_test

- Extra libraries specified via LIBRARIES part of CMake function
 - Convert all the other module tests

CMakeModules/CalamaresAddTest.cmake

@@ -34,7 +34,7 @@ function( calamares_add_test )
     # parse arguments (name needs to be saved before passing ARGN into the macro)
     set( NAME ${ARGV0} )
     set( options GUI )
-    set( multiValueArgs SOURCES )
+    set( multiValueArgs SOURCES LIBRARIES )
     cmake_parse_arguments( TEST "${options}" "" "${multiValueArgs}" ${ARGN} )
     set( TEST_NAME ${NAME} )
 
@@ -45,13 +45,14 @@ function( calamares_add_test )
                 ${TEST_NAME}
             LINK_LIBRARIES
                 calamares
+                ${TEST_LIBRARIES}
                 Qt5::Core
                 Qt5::Test
             )
         calamares_automoc( ${TEST_NAME} )
         target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST )
         if( TEST_GUI )
-            target_link_libraries( ${TEST_NAME} PRIVATE calamaresui Qt5::Gui )
+            target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui )
         endif()
     endif()
 endfunction()

src/modules/contextualprocess/CMakeLists.txt

@@ -8,18 +8,12 @@ calamares_add_plugin( contextualprocess
     SHARED_LIB
 )
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
+    contextualprocesstest
+    GUI  # It's not
+    SOURCES
         Tests.cpp
         ContextualProcessJob.cpp  # Builds it a second time
-        TEST_NAME
+    LIBRARIES
-            contextualprocesstest
-        LINK_LIBRARIES
-            ${CALAMARES_LIBRARIES}
-            calamaresui
         ${YAMLCPP_LIBRARY}
-            Qt5::Core
-            Qt5::Test
 )
-    calamares_automoc( contextualprocesstest )
-endif()

src/modules/fsresizer/CMakeLists.txt

@@ -30,21 +30,15 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
         SHARED_LIB
     )
 
-    if( ECM_FOUND AND BUILD_TESTING )
+    calamares_add_test(
-        ecm_add_test(
-                Tests.cpp
-            TEST_NAME
         fsresizertest
-            LINK_LIBRARIES
+        SOURCES
-                ${CALAMARES_LIBRARIES}
+            Tests.cpp
-                calamares
+        LIBRARIES
             calamares_job_fsresizer  # From above
             ${YAMLCPP_LIBRARY}
-                Qt5::Core
-                Qt5::Test
     )
-        set_target_properties( fsresizertest PROPERTIES AUTOMOC TRUE )
+    if( TARGET fsresizertest )
-        target_include_directories( fsresizertest PRIVATE /usr/local/include )
         target_compile_definitions( fsresizertest PRIVATE ${_partition_defs} )
     endif()
 else()

src/modules/hostinfo/CMakeLists.txt

@@ -32,18 +32,12 @@ if ( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
     target_compile_definitions( calamares_job_hostinfo PRIVATE WITH_KOSRelease )
 endif()
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
-            Tests.cpp
-            HostInfoJob.cpp  # Builds it a second time
-        TEST_NAME
     hostinfotest
-        LINK_LIBRARIES
+    GUI  # It's not
-            ${CALAMARES_LIBRARIES}
+    SOURCES
-            calamaresui
+        Tests.cpp
+        HostInfoJob.cpp
+    LIBRARIES
         ${YAMLCPP_LIBRARY}
-            Qt5::Core
-            Qt5::Test
 )
-    calamares_automoc( hostinfotest )
-endif()

src/modules/initcpio/CMakeLists.txt

@@ -8,18 +8,12 @@ calamares_add_plugin( initcpio
     SHARED_LIB
 )
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
-            Tests.cpp
-        TEST_NAME
     initcpiotest
-        LINK_LIBRARIES
+    GUI  # It's not
-            ${CALAMARES_LIBRARIES}
+    SOURCES
-            calamares
+        Tests.cpp
+    LIBRARIES
         calamares_job_initcpio # From above
         ${YAMLCPP_LIBRARY}
-            Qt5::Core
-            Qt5::Test
 )
-    calamares_automoc( initcpiotest )
-endif()

src/modules/initramfs/CMakeLists.txt

@@ -8,18 +8,12 @@ calamares_add_plugin( initramfs
     SHARED_LIB
 )
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
-            Tests.cpp
-        TEST_NAME
     initramfstest
-        LINK_LIBRARIES
+    GUI  # It's not
-            ${CALAMARES_LIBRARIES}
+    SOURCES
-            calamares
+        Tests.cpp
+    LIBRARIES
         calamares_job_initramfs # From above
         ${YAMLCPP_LIBRARY}
-            Qt5::Core
-            Qt5::Test
 )
-    calamares_automoc( initramfstest )
-endif()

src/modules/locale/CMakeLists.txt

@@ -31,15 +31,9 @@ calamares_add_plugin( locale
     SHARED_LIB
 )
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
+    localetest
+    SOURCES
         Tests.cpp
         LocaleConfiguration.cpp
-        TEST_NAME
-            localetest
-        LINK_LIBRARIES
-            calamares
-            Qt5::Test
 )
-    calamares_automoc( localetest )
-endif()

src/modules/packagechooser/CMakeLists.txt

@@ -53,18 +53,12 @@ calamares_add_plugin( packagechooser
     SHARED_LIB
 )
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
-            Tests.cpp
-        TEST_NAME
     packagechoosertest
-        LINK_LIBRARIES
+    GUI
-            ${CALAMARES_LIBRARIES}
+    SOURCES
+        Tests.cpp
+    LIBRARIES
         calamares_viewmodule_packagechooser
-            Qt5::Core
-            Qt5::Test
-            Qt5::Gui
         ${_extra_libraries}
 )
-    calamares_automoc( packagechoosertest)
-endif()

src/modules/partition/tests/CMakeLists.txt

@@ -21,16 +21,12 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test( ${partitionjobtests_SRCS}
+    partitionjobtests
-        TEST_NAME partitionjobtests
+    SOURCES ${partitionjobtests_SRCS}
-        LINK_LIBRARIES
+    LIBRARIES
-            ${CALAMARES_LIBRARIES}
         kpmcore
-            Qt5::Core
-            Qt5::Test
 )
-
+if( TARGET partitionjobtests )
-    set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE )
     target_compile_definitions( partitionjobtests PRIVATE ${_partition_defs} )
 endif()

src/modules/shellprocess/CMakeLists.txt

@@ -8,17 +8,11 @@ calamares_add_plugin( shellprocess
     SHARED_LIB
 )
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
-            Tests.cpp
-        TEST_NAME
     shellprocesstest
-        LINK_LIBRARIES
+    GUI  # It's not
-            ${CALAMARES_LIBRARIES}
+    SOURCES
-            calamaresui
+        Tests.cpp
+    LIBRARIES
         ${YAMLCPP_LIBRARY}
-            Qt5::Core
-            Qt5::Test
 )
-    calamares_automoc( shellprocesstest )
-endif()

src/modules/users/CMakeLists.txt

@@ -39,17 +39,11 @@ calamares_add_plugin( users
     SHARED_LIB
 )
 
-if( ECM_FOUND AND BUILD_TESTING )
+calamares_add_test(
-    ecm_add_test(
+    passwordtest
+    SOURCES
         PasswordTests.cpp
         SetPasswordJob.cpp
-        TEST_NAME
+    LIBRARIES
-            passwordtest
-        LINK_LIBRARIES
-            ${CALAMARES_LIBRARIES}
-            Qt5::Core
-            Qt5::Test
         ${CRYPT_LIBRARIES}
 )
-    calamares_automoc( passwordtest )
-endif()