diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-07 16:46:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-07 16:46:55 (GMT) |
| commit | e2e9a4b4c9a43eca4764d3c88bcfdbe2c582b0f1 (patch) | |
| tree | f2330b41b72e06a4e3628a5048ef58e4291640b2 | |
| parent | f93ce447e89414c3f709097a89eec6184bfd5864 (diff) | |
| parent | 8809183d58c6ffbe9b9479ac43f44c985a4b8a5b (diff) | |
| download | CMake-e2e9a4b4c9a43eca4764d3c88bcfdbe2c582b0f1.zip CMake-e2e9a4b4c9a43eca4764d3c88bcfdbe2c582b0f1.tar.gz CMake-e2e9a4b4c9a43eca4764d3c88bcfdbe2c582b0f1.tar.bz2 | |
Merge topic 'test-download-server-timeout'
8809183d58 Tests: Optionally extend RunCMake.ExternalProject download server timeout
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6952
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/ExternalProject/RunCMakeTest.cmake | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 1d7e632..ddc00f8 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -733,6 +733,9 @@ add_RunCMake_test(CPackInstallProperties) if(XCODE_VERSION) set(ExternalProject_ARGS -DXCODE_VERSION=${XCODE_VERSION}) endif() +if(CMake_TEST_RunCMake_ExternalProject_DOWNLOAD_SERVER_TIMEOUT) + list(APPEND ExternalProject_ARGS -DDOWNLOAD_SERVER_TIMEOUT=${CMake_TEST_RunCMake_ExternalProject_DOWNLOAD_SERVER_TIMEOUT}) +endif() add_RunCMake_test(ExternalProject) add_RunCMake_test(FetchContent) set(CTestCommandLine_ARGS -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}) diff --git a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake index fde384f..08adee2 100644 --- a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake @@ -105,12 +105,15 @@ function(__ep_test_with_build_with_server testName) if(EXISTS "${URL_FILE}") file(REMOVE "${URL_FILE}") endif() + if(NOT DOWNLOAD_SERVER_TIMEOUT) + set(DOWNLOAD_SERVER_TIMEOUT 30) + endif() execute_process( COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/DownloadServer.py --file "${URL_FILE}" ${ARGN} OUTPUT_FILE ${RunCMake_BINARY_DIR}/${testName}-python.txt ERROR_FILE ${RunCMake_BINARY_DIR}/${testName}-python.txt RESULT_VARIABLE result - TIMEOUT 30 + TIMEOUT "${DOWNLOAD_SERVER_TIMEOUT}" ) if(NOT result EQUAL 0) message(FATAL_ERROR "Failed to start download server:\n ${result}") |