diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-03 11:36:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-03 11:36:54 (GMT) |
| commit | e46e4ee96af89d18040afbfb7d562c2427e6c01e (patch) | |
| tree | aaad9f305fd7df3e77411bfdea92dab28996916e /Tests/RunCMake/ExternalProject | |
| parent | c57688d9c1f182828022cd36510595e29c12b9c8 (diff) | |
| download | CMake-e46e4ee96af89d18040afbfb7d562c2427e6c01e.zip CMake-e46e4ee96af89d18040afbfb7d562c2427e6c01e.tar.gz CMake-e46e4ee96af89d18040afbfb7d562c2427e6c01e.tar.bz2 | |
Tests: Fix RunCMake.ExternalProject filesystem delay for Borland Makefiles
Our 1.125s delay does not seem to be long enough to be reliable with
the Borland "make" tool. Use a longer delay for Borland and Watcom.
Follow the pattern from commit 67040500ea (Tests: Fix
RunCMake.BuildDepends filesystem delay for Borland Makefiles,
2015-09-25, v3.4.0-rc1~38^2).
Diffstat (limited to 'Tests/RunCMake/ExternalProject')
| -rw-r--r-- | Tests/RunCMake/ExternalProject/RunCMakeTest.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake index 08adee2..2588d6c 100644 --- a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake @@ -6,6 +6,13 @@ include(RunCMake) unset(ENV{http_proxy}) unset(ENV{https_proxy}) +if(RunCMake_GENERATOR STREQUAL "Borland Makefiles" OR + RunCMake_GENERATOR STREQUAL "Watcom WMake") + set(fs_delay 3) +else() + set(fs_delay 1.125) +endif() + run_cmake(BadIndependentStep1) run_cmake(BadIndependentStep2) run_cmake(NoOptions) @@ -72,7 +79,7 @@ function(__ep_test_source_dir_change) # we have to ensure we don't re-run the configure stage too quickly after the # first build. Otherwise, the modified RepositoryInfo.txt files the next # configure writes might still have the same timestamp as the previous one. - execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) + execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${fs_delay}) run_cmake_command(SourceDirChange-change ${CMAKE_COMMAND} -DSOURCE_DIR_CHANGE=YES .) run_cmake_command(SourceDirChange-build2 ${CMAKE_COMMAND} --build .) endfunction() |