[tests] Set test executable to multipass_cpp_tests

Author: tobe2098

BUILD.windows.md

@@ -140,7 +140,7 @@ Finally, to build the project, run:
 cmake --build . --parallel
 ```
 
-This builds `multipass`, `multipassd`, and `multipass_tests`.
+This builds `multipass`, `multipassd`, and `multipass_cpp_tests`.
 To create an installer, run `cmake --build . --target package`.
 
 ## Running `multipass`

rxx/CMakeLists.txt

@@ -106,7 +106,6 @@ if(cmake_build_type_lower MATCHES "coverage")
   if (NOT TARPAULIN_INSTALLED EQUAL 0)
     execute_process(
       COMMAND ${CARGO_EXECUTABLE} install cargo-tarpaulin
-      COMMENT "Installing cargo-tarpaulin for coverage builds"
     )
   endif()
     #Engine is for non-x86_64 processors. Can only use if return codes from test are always 0 + no fork or similar syscalls

tests/CMakeLists.txt

@@ -19,7 +19,7 @@ include(c_mock_defines.cmake)
 
 find_package(GTest CONFIG REQUIRED)
 
-add_executable(multipass_tests
+add_executable(multipass_cpp_tests
   common.cpp
   daemon_test_fixture.cpp
   file_operations.cpp
@@ -120,7 +120,7 @@ add_executable(multipass_tests
   test_standard_logger.cpp
 )
 
-target_include_directories(multipass_tests
+target_include_directories(multipass_cpp_tests
   PRIVATE ${CMAKE_SOURCE_DIR}
   PRIVATE ${CMAKE_SOURCE_DIR}/src
   PRIVATE ${CMAKE_SOURCE_DIR}/src/platform/backends
@@ -139,7 +139,7 @@ target_compile_definitions(ssh_client_test PRIVATE
 target_compile_definitions(utils_test PRIVATE
   -DEVP_PBE_scrypt=ut_EVP_PBE_scrypt)
 
-target_link_libraries(multipass_tests
+target_link_libraries(multipass_cpp_tests
   cert
   client
   daemon
@@ -163,21 +163,21 @@ target_link_libraries(multipass_tests
   yaml-cpp::yaml-cpp
 )
 
-add_test(NAME multipass_tests
-  COMMAND multipass_tests
+add_test(NAME multipass_cpp_tests
+  COMMAND multipass_cpp_tests
 )
 
 foreach(BACKEND IN LISTS MULTIPASS_BACKENDS)
   string(TOUPPER ${BACKEND}_ENABLED DEF)
-  target_compile_definitions(multipass_tests PRIVATE ${DEF})
+  target_compile_definitions(multipass_cpp_tests PRIVATE ${DEF})
 endforeach()
 
 string(TOLOWER ${CMAKE_HOST_SYSTEM_PROCESSOR} MANIFEST_ARCH)
 if (${MANIFEST_ARCH} STREQUAL "x86_64")
   string(TOLOWER "amd64" MANIFEST_ARCH)
 endif()
 
-target_compile_definitions(multipass_tests PRIVATE -DMANIFEST_ARCH="${MANIFEST_ARCH}")
+target_compile_definitions(multipass_cpp_tests PRIVATE -DMANIFEST_ARCH="${MANIFEST_ARCH}")
 
 file(GLOB_RECURSE TEST_DATA_FILES
      CONFIGURE_DEPENDS
@@ -219,14 +219,14 @@ foreach(f IN LISTS PLAIN_TEST_DATA_FILES)
 endforeach()
 
 add_custom_target(copy_test_data ALL DEPENDS ${COPIED_PLAIN_FILES})
-add_dependencies(multipass_tests copy_test_data)
+add_dependencies(multipass_cpp_tests copy_test_data)
 
 set(TEST_DATA_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_data")
 configure_file(
   test_data_path.h.in
   ${MULTIPASS_GENERATED_SOURCE_DIR}/multipass/test_data_path.h
   @ONLY)
-target_include_directories(multipass_tests PRIVATE ${MULTIPASS_GENERATED_SOURCE_DIR}/multipass/gen)
+target_include_directories(multipass_cpp_tests PRIVATE ${MULTIPASS_GENERATED_SOURCE_DIR}/multipass/gen)
 
 # Mock binaries for testing BasicProcess (cross-platform compatible)
 add_executable(mock_process
@@ -238,17 +238,17 @@ set_target_properties(mock_process
   RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/mocks"
   RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/mocks")
 
-add_dependencies(multipass_tests mock_process)
+add_dependencies(multipass_cpp_tests mock_process)
 
 if(MSVC)
   add_definitions(-DGTEST_LANG_CXX11=1)
-  target_compile_options(multipass_tests PRIVATE /bigobj)
+  target_compile_options(multipass_cpp_tests PRIVATE /bigobj)
 elseif(APPLE)
   set(CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override")
   add_definitions(-DHOST_ARCH="${HOST_ARCH}")
 endif()
 
-target_include_directories(multipass_tests
+target_include_directories(multipass_cpp_tests
   BEFORE
     PRIVATE ${CMAKE_SOURCE_DIR}/src/platform/backends/shared/${MULTIPASS_PLATFORM}
 )

tests/daemon_test_fixture.cpp

@@ -391,7 +391,7 @@ void mpt::DaemonTestFixture::send_commands(std::vector<std::vector<std::string>>
         TestClient client{client_config};
         for (const auto& command : commands)
         {
-            QStringList args = QStringList() << "multipass_test";
+            QStringList args = QStringList() << "multipass_cpp_test";
 
             for (const auto& arg : command)
             {

tests/hyperv/CMakeLists.txt

@@ -1,4 +1,4 @@
-target_sources(multipass_tests
+target_sources(multipass_cpp_tests
   PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/test_hyperv_backend.cpp
 )

tests/linux/CMakeLists.txt

@@ -1,4 +1,4 @@
-target_sources(multipass_tests
+target_sources(multipass_cpp_tests
   PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/test_apparmored_process.cpp
     ${CMAKE_CURRENT_LIST_DIR}/test_backend_utils.cpp
@@ -8,19 +8,19 @@ target_sources(multipass_tests
 )
 
 if(TARGET logger_linux_journald)
-  target_sources(multipass_tests PRIVATE ${CMAKE_CURRENT_LIST_DIR}/test_journald_logger.cpp)
-  target_link_libraries(multipass_tests logger_linux_journald)
+  target_sources(multipass_cpp_tests PRIVATE ${CMAKE_CURRENT_LIST_DIR}/test_journald_logger.cpp)
+  target_link_libraries(multipass_cpp_tests logger_linux_journald)
 endif()
 
 if(TARGET logger_linux_syslog)
-  target_sources(multipass_tests PRIVATE ${CMAKE_CURRENT_LIST_DIR}/test_syslog_logger.cpp)
-  target_link_libraries(multipass_tests logger_linux_syslog)
+  target_sources(multipass_cpp_tests PRIVATE ${CMAKE_CURRENT_LIST_DIR}/test_syslog_logger.cpp)
+  target_link_libraries(multipass_cpp_tests logger_linux_syslog)
 endif()
 
 target_compile_definitions(shared_linux_test PRIVATE
   -Daa_is_enabled=ut_aa_is_enabled)
 
-target_link_libraries(multipass_tests
+target_link_libraries(multipass_cpp_tests
   shared_linux_test)
 
 add_executable(apparmor_parser
@@ -32,4 +32,4 @@ set_target_properties(apparmor_parser
   RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/mocks"
   RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/mocks")
 
-add_dependencies(multipass_tests apparmor_parser)
+add_dependencies(multipass_cpp_tests apparmor_parser)

tests/macos/CMakeLists.txt

@@ -1,4 +1,4 @@
-target_sources(multipass_tests
+target_sources(multipass_cpp_tests
   PRIVATE
   ${CMAKE_CURRENT_LIST_DIR}/test_platform_osx.cpp
   ${CMAKE_CURRENT_LIST_DIR}/test_backend_utils.cpp

tests/main.cpp

@@ -27,7 +27,7 @@ namespace mp = multipass;
 int main(int argc, char* argv[])
 {
     QCoreApplication app(argc, argv);
-    QCoreApplication::setApplicationName("multipass_tests");
+    QCoreApplication::setApplicationName("multipass_cpp_tests");
 
     ::testing::InitGoogleTest(&argc, argv);
     mp::test::MockStandardPaths::mockit();

tests/qemu/CMakeLists.txt

@@ -1,4 +1,4 @@
-target_sources(multipass_tests
+target_sources(multipass_cpp_tests
   PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/test_qemu_backend.cpp
     ${CMAKE_CURRENT_LIST_DIR}/test_qemu_img_utils.cpp
@@ -17,7 +17,7 @@ set_target_properties(qemu-img
   RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/mocks"
   RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/mocks")
 
-add_dependencies(multipass_tests
+add_dependencies(multipass_cpp_tests
   qemu-img
 )
 

tests/qemu/linux/CMakeLists.txt

@@ -13,15 +13,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-target_sources(multipass_tests
+target_sources(multipass_cpp_tests
   PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}/test_dnsmasq_server.cpp
     ${CMAKE_CURRENT_LIST_DIR}/test_dnsmasq_process_spec.cpp
     ${CMAKE_CURRENT_LIST_DIR}/test_firewall_config.cpp
     ${CMAKE_CURRENT_LIST_DIR}/test_qemu_platform_detail.cpp
 )
 
-target_include_directories(multipass_tests PRIVATE ${CMAKE_SOURCE_DIR}/src/platform/backends/qemu)
+target_include_directories(multipass_cpp_tests PRIVATE ${CMAKE_SOURCE_DIR}/src/platform/backends/qemu)
 
 add_executable(dnsmasq
   mock_dnsmasq.cpp)
@@ -44,7 +44,7 @@ set_target_properties(dhcp_release
   RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/mocks"
   RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/mocks")
 
-add_dependencies(multipass_tests
+add_dependencies(multipass_cpp_tests
   dnsmasq
   dhcp_release
 )