diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-16 11:27:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-16 11:27:16 (GMT) |
| commit | 30b7c40ad88a83eef1ef842bf93b777214808db4 (patch) | |
| tree | b567d977397981efa5a11602add9900486cdc759 /Tests/RunCMake/GoogleTest/RunCMakeTest.cmake | |
| parent | 43e8e0b6884ddcf3f55826c2247af268698f23a6 (diff) | |
| parent | 96fdde26bbbc969944e556ad649191cd21f46990 (diff) | |
| download | CMake-30b7c40ad88a83eef1ef842bf93b777214808db4.zip CMake-30b7c40ad88a83eef1ef842bf93b777214808db4.tar.gz CMake-30b7c40ad88a83eef1ef842bf93b777214808db4.tar.bz2 | |
Merge topic 'gtest_discover_tests_timeout'
96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1851
Diffstat (limited to 'Tests/RunCMake/GoogleTest/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/GoogleTest/RunCMakeTest.cmake | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/Tests/RunCMake/GoogleTest/RunCMakeTest.cmake b/Tests/RunCMake/GoogleTest/RunCMakeTest.cmake index 209e769..0fa4e2a 100644 --- a/Tests/RunCMake/GoogleTest/RunCMakeTest.cmake +++ b/Tests/RunCMake/GoogleTest/RunCMakeTest.cmake @@ -19,12 +19,19 @@ function(run_GoogleTest) --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-timeout + run_cmake_command(GoogleTest-discovery-timeout ${CMAKE_COMMAND} --build . --config Debug - --target timeout_test + --target discovery_timeout_test ) set(RunCMake_TEST_OUTPUT_MERGE 0) @@ -45,7 +52,21 @@ function(run_GoogleTest) run_cmake_command(GoogleTest-test-missing ${CMAKE_CTEST_COMMAND} -C Debug - -R timeout + -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() |