diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-15 13:37:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-15 13:37:32 (GMT) |
| commit | f21bad80a297e26b886f15f38f4d87cc5ce9687f (patch) | |
| tree | 65a88952fbd06413bb7195fae686349cc555f251 | |
| parent | b3d1d6d895355ee64c74cef1ab0040db02f81894 (diff) | |
| parent | ca355d92d827a26d626a241535fe710600eead0d (diff) | |
| download | CMake-f21bad80a297e26b886f15f38f4d87cc5ce9687f.zip CMake-f21bad80a297e26b886f15f38f4d87cc5ce9687f.tar.gz CMake-f21bad80a297e26b886f15f38f4d87cc5ce9687f.tar.bz2 | |
Merge topic 'test-XcodeProject-timeout'
ca355d92d8 Tests: Add option for custom RunCMake.XcodeProject timeout
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2614
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index b6b6519..2df15ee 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -335,6 +335,13 @@ endif() if(XCODE_VERSION) add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION}) + + # This test can take a very long time due to lots of combinations. + # Use a long default timeout and provide an option to customize it. + if(NOT DEFINED CMake_TEST_XcodeProject_TIMEOUT) + set(CMake_TEST_XcodeProject_TIMEOUT 2000) + endif() + set_property(TEST RunCMake.XcodeProject PROPERTY TIMEOUT ${CMake_TEST_XcodeProject_TIMEOUT}) endif() if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" |