diff options
| author | Brad King <brad.king@kitware.com> | 2023-07-25 13:20:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-07-25 13:21:10 (GMT) |
| commit | 1e085cbff7059cd38ebea0bca8cb414fd30c2d06 (patch) | |
| tree | e13aa688ba70e601d0993df83c663696d521f076 /Tests | |
| parent | 21721ad3cea539a0157f77e19add5aa873290fa3 (diff) | |
| parent | 0e8584c89cdc8114cf2b037ac3d5a76599733ecf (diff) | |
| download | CMake-1e085cbff7059cd38ebea0bca8cb414fd30c2d06.zip CMake-1e085cbff7059cd38ebea0bca8cb414fd30c2d06.tar.gz CMake-1e085cbff7059cd38ebea0bca8cb414fd30c2d06.tar.bz2 | |
Merge topic 'fix-ctest-timeout-regression' into release-3.27
0e8584c89c CTest: Fix regression in calculating test timeout
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8647
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt b/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt new file mode 100644 index 0000000..6e46485 --- /dev/null +++ b/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt @@ -0,0 +1,6 @@ +Test project [^ +]*/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-build + Start 1: TestTimeout +1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec ++ +100% tests passed, 0 tests failed out of 1 diff --git a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake index 6caeef1..2f9eda1 100644 --- a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake @@ -87,3 +87,10 @@ block() set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") run_ctest_timeout(ZeroOverridesVar) endblock() + +block() + set(TIMEOUT 4) + set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") + set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT 10)\n") + run_ctest_timeout(PropertyOverridesScript) +endblock() |