From 63a5b8995f0b918a36dd8188cdd8dd796c87d58b Mon Sep 17 00:00:00 2001 From: Travis Hunter Date: Fri, 15 Mar 2024 15:17:26 -0600 Subject: [PATCH] Update CTest infrastructure to automatically run qtrocket unit tests --- .github/workflows/cmake-multi-platform.yml | 2 +- CMakeLists.txt | 6 ++++-- model/tests/CMakeLists.txt | 3 +-- sim/tests/CMakeLists.txt | 3 +-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 3903e8d..13553a1 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -83,4 +83,4 @@ jobs: working-directory: ${{ steps.strings.outputs.build-output-dir }} # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest --build-config ${{ matrix.build_type }} + run: ctest --build-config ${{ matrix.build_type }} -R 'qtrocket_*' diff --git a/CMakeLists.txt b/CMakeLists.txt index dec1a0f..b6cdec5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ project(qtrocket VERSION 0.1 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) +enable_testing() + include(FetchContent) # Google Test framework @@ -48,10 +50,10 @@ endif() FetchContent_MakeAvailable(CURL) # eigen dependency -FetchContent_Declare(eigen +FetchContent_Declare(Eigen GIT_REPOSITORY https://gitlab.com/libeigen/eigen GIT_TAG 3.4.0) -FetchContent_MakeAvailable(eigen) +FetchContent_MakeAvailable(Eigen) # boost dependency diff --git a/model/tests/CMakeLists.txt b/model/tests/CMakeLists.txt index a75b55e..294019a 100644 --- a/model/tests/CMakeLists.txt +++ b/model/tests/CMakeLists.txt @@ -1,4 +1,3 @@ -enable_testing() add_executable(model_tests PartTests.cpp @@ -13,5 +12,5 @@ target_link_libraries(model_tests PRIVATE include(GoogleTest) gtest_discover_tests(model_tests) -add_test(model_tests model_tests) +add_test(NAME qtrocket_model_tests COMMAND model_tests) diff --git a/sim/tests/CMakeLists.txt b/sim/tests/CMakeLists.txt index 2fcec54..aca0eb7 100644 --- a/sim/tests/CMakeLists.txt +++ b/sim/tests/CMakeLists.txt @@ -1,4 +1,3 @@ -enable_testing() add_executable(sim_tests USStandardAtmosphereTests.cpp @@ -12,5 +11,5 @@ target_link_libraries(sim_tests include(GoogleTest) gtest_discover_tests(sim_tests) -add_test(sim_tests sim_tests) +add_test(NAME qtrocket_sim_tests COMMAND sim_tests)