mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-10-14 04:02:09 +03:00
Craig Scott
96fdde26bb
In gtest_discover_tests(), the TIMEOUT keyword was making it impossible to set the TIMEOUT test property via the PROPERTIES keyword. This would be a frequent case, but it doesn't complain and instead silently does something different to what would normally be expected. The TIMEOUT keyword has been renamed to DISCOVERY_TIMEOUT, thereby removing the clash. This is a breaking change. 3.10.1 and 3.10.2 were the only versions that supported the TIMEOUT keyword and uses of it were likely not working as intended. Fixes: #17801
75 lines
1.6 KiB
CMake
75 lines
1.6 KiB
CMake
include(RunCMake)
|
|
|
|
function(run_GoogleTest)
|
|
# Use a single build tree for a few tests without cleaning.
|
|
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/GoogleTest-build)
|
|
set(RunCMake_TEST_NO_CLEAN 1)
|
|
if(RunCMake_GENERATOR MATCHES "Make|Ninja")
|
|
set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
|
|
endif()
|
|
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
|
|
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
|
|
|
|
run_cmake(GoogleTest)
|
|
|
|
run_cmake_command(GoogleTest-build
|
|
${CMAKE_COMMAND}
|
|
--build .
|
|
--config Debug
|
|
--target fake_gtest
|
|
)
|
|
|
|
run_cmake_command(GoogleTest-property-timeout-exe
|
|
${CMAKE_COMMAND}
|
|
--build .
|
|
--config Debug
|
|
--target property_timeout_test
|
|
)
|
|
|
|
set(RunCMake_TEST_OUTPUT_MERGE 1)
|
|
run_cmake_command(GoogleTest-discovery-timeout
|
|
${CMAKE_COMMAND}
|
|
--build .
|
|
--config Debug
|
|
--target discovery_timeout_test
|
|
)
|
|
set(RunCMake_TEST_OUTPUT_MERGE 0)
|
|
|
|
run_cmake_command(GoogleTest-test1
|
|
${CMAKE_CTEST_COMMAND}
|
|
-C Debug
|
|
-L TEST1
|
|
--no-label-summary
|
|
)
|
|
|
|
run_cmake_command(GoogleTest-test2
|
|
${CMAKE_CTEST_COMMAND}
|
|
-C Debug
|
|
-L TEST2
|
|
--no-label-summary
|
|
)
|
|
|
|
run_cmake_command(GoogleTest-test-missing
|
|
${CMAKE_CTEST_COMMAND}
|
|
-C Debug
|
|
-R no_tests_defined
|
|
--no-label-summary
|
|
)
|
|
|
|
run_cmake_command(GoogleTest-property-timeout1
|
|
${CMAKE_CTEST_COMMAND}
|
|
-C Debug
|
|
-R property_timeout\\.case_no_discovery
|
|
--no-label-summary
|
|
)
|
|
|
|
run_cmake_command(GoogleTest-property-timeout2
|
|
${CMAKE_CTEST_COMMAND}
|
|
-C Debug
|
|
-R property_timeout\\.case_with_discovery
|
|
--no-label-summary
|
|
)
|
|
endfunction()
|
|
|
|
run_GoogleTest()
|