🐛 Fix test machinery

Author: elbeno

.github/workflows/unit_tests.yml

@@ -176,7 +176,7 @@ jobs:
       - name: Test
         working-directory: ${{github.workspace}}/build
         run: |
-          ctest -j $(nproc) -T memcheck
+          ctest -j $(nproc) -E EXPECT_FAIL -T memcheck
 
           LOGFILE=$(ls ./Testing/Temporary/LastDynamicAnalysis_*.log)
           FAILSIZE=$(du -c ./Testing/Temporary/MemoryChecker.* | tail -1 | cut -f1)

cmake/test.cmake

@@ -79,7 +79,7 @@ macro(add_rapidcheck)
     endif()
 endmacro()
 
-function(add_unit_test name)
+function(add_unit_test_target name)
     set(options CATCH2 GTEST GUNIT)
     set(multiValueArgs FILES INCLUDE_DIRECTORIES LIBRARIES SYSTEM_LIBRARIES)
     cmake_parse_arguments(UNIT "${options}" "" "${multiValueArgs}" ${ARGN})
@@ -92,15 +92,11 @@ function(add_unit_test name)
     add_dependencies(build_unit_tests ${name})
 
     if(UNIT_CATCH2)
-        get_catch2()
-        add_rapidcheck()
         catch_discover_tests(${name})
         target_link_libraries_system(${name} PRIVATE Catch2::Catch2WithMain
                                      rapidcheck rapidcheck_catch)
         set(target_test_command $<TARGET_FILE:${name}> "--order" "rand")
     elseif(UNIT_GTEST)
-        get_gtest()
-        add_rapidcheck()
         gtest_discover_tests(${name})
         target_link_libraries_system(
             ${name}
@@ -113,9 +109,6 @@ function(add_unit_test name)
             rapidcheck_gmock)
         set(target_test_command $<TARGET_FILE:${name}> "--gtest_shuffle")
     elseif(UNIT_GUNIT)
-        get_gunit()
-        add_boost_di()
-        add_rapidcheck()
         target_include_directories(
             ${name} SYSTEM
             PRIVATE ${gunit_SOURCE_DIR}/include
@@ -147,7 +140,38 @@ function(add_unit_test name)
     add_dependencies(unit_tests "run_${name}")
 endfunction()
 
-function(add_feature_test name)
+function(detect_test_framework)
+    set(options CATCH2 GTEST GUNIT)
+    cmake_parse_arguments(TF "${options}" "" "" ${ARGN})
+    if(TF_CATCH)
+        return(PROPAGATE TF_CATCH)
+    elseif(TF_GTEST)
+        return(PROPAGATE TF_GTEST)
+    elseif(TF_GUNIT)
+        return(PROPAGATE TF_GUNIT)
+    endif()
+endfunction()
+
+macro(add_unit_test)
+    detect_test_framework(${ARGN})
+    if(TF_CATCH)
+        get_catch2()
+        add_rapidcheck()
+        unset(TF_CATCH)
+    elseif(TF_GTEST)
+        get_gtest()
+        add_rapidcheck()
+        unset(TF_GTEST)
+    elseif(TF_GUNIT)
+        get_gunit()
+        add_boost_di()
+        add_rapidcheck()
+        unset(TF_GUNIT)
+    endif()
+    add_unit_test_target(${ARGN})
+endmacro()
+
+function(add_feature_test_target name)
     set(singleValueArgs FEATURE)
     set(multiValueArgs FILES INCLUDE_DIRECTORIES LIBRARIES SYSTEM_LIBRARIES)
     cmake_parse_arguments(FEAT "${options}" "${singleValueArgs}"
@@ -160,10 +184,6 @@ function(add_feature_test name)
     target_link_libraries(${name} PRIVATE sanitizers)
     add_dependencies(build_unit_tests ${name})
 
-    get_gunit()
-    add_gherkin()
-    add_boost_di()
-    add_rapidcheck()
     target_include_directories(
         ${name} SYSTEM
         PRIVATE ${gunit_SOURCE_DIR}/include
@@ -195,3 +215,11 @@ function(add_feature_test name)
     set_property(TEST ${name} PROPERTY ENVIRONMENT "SCENARIO=${FEATURE_FILE}")
     add_dependencies(unit_tests "run_${name}")
 endfunction()
+
+macro(add_feature_test)
+    get_gunit()
+    add_gherkin()
+    add_boost_di()
+    add_rapidcheck()
+    add_feature_test_target(${ARGN})
+endmacro()

test/CMakeLists.txt

@@ -1,22 +1,15 @@
 # Test that code is NOT able to compile
-function(test_static_assert_fail TEST_NAME)
-    add_executable(${TEST_NAME}_t EXCLUDE_FROM_ALL ${TEST_NAME}.cpp)
-    target_link_libraries(${TEST_NAME}_t PRIVATE safe_arithmetic)
-    add_test(NAME ${TEST_NAME}
+function(test_static_assert_fail test_file)
+    string(REPLACE "/" "_" test_name "${test_file}")
+    string(PREPEND test_name "EXPECT_FAIL.")
+    add_executable(${test_name} EXCLUDE_FROM_ALL ${test_file})
+    target_link_libraries(${test_name} PRIVATE safe_arithmetic)
+    add_test(NAME ${test_name}
              COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
-                     ${TEST_NAME}_t)
+                     ${test_name})
     set_tests_properties(
-        ${TEST_NAME} PROPERTIES PASS_REGULAR_EXPRESSION
+        ${test_name} PROPERTIES PASS_REGULAR_EXPRESSION
                                 "(static_assert)|(static assertion failed)")
 endfunction()
 
-# Test that code that must compile
-function(test_static_assert_pass TEST_NAME)
-    add_executable(${TEST_NAME}_t EXCLUDE_FROM_ALL ${TEST_NAME}.cpp)
-    target_link_libraries(${TEST_NAME}_t PRIVATE safe_arithmetic)
-    add_test(NAME ${TEST_NAME}
-             COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
-                     ${TEST_NAME}_t)
-endfunction()
-
 add_subdirectory(safe)

test/safe/array/CMakeLists.txt

@@ -1 +1 @@
-test_static_assert_fail(array_constant_access_max_violation)
+test_static_assert_fail(array_constant_access_max_violation.cpp)

test/safe/var/CMakeLists.txt

@@ -1,8 +1,8 @@
-test_static_assert_fail(assign_constant_max_violation)
-test_static_assert_fail(assign_constant_min_violation)
-test_static_assert_fail(construct_constant_max_violation)
-test_static_assert_fail(construct_constant_min_violation)
-test_static_assert_fail(interval_larger_than_type)
-test_static_assert_fail(assign_lhs_rhs_union)
-test_static_assert_fail(assign_lhs_union)
-test_static_assert_fail(assign_rhs_union)
+test_static_assert_fail(assign_constant_max_violation.cpp)
+test_static_assert_fail(assign_constant_min_violation.cpp)
+test_static_assert_fail(construct_constant_max_violation.cpp)
+test_static_assert_fail(construct_constant_min_violation.cpp)
+test_static_assert_fail(interval_larger_than_type.cpp)
+test_static_assert_fail(assign_lhs_rhs_union.cpp)
+test_static_assert_fail(assign_lhs_union.cpp)
+test_static_assert_fail(assign_rhs_union.cpp)