diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-04 12:13:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-04 12:13:20 (GMT) |
| commit | d8e5d9240cd0ffcf3af79bd54dd22f60e49e2415 (patch) | |
| tree | 2af620a8e9ec2ed64b7d2d843c6dd38f4f972f64 /Tests | |
| parent | 3b371e1dffa5c568c53e88bb737ddf1f06aa1aec (diff) | |
| parent | e46e4ee96af89d18040afbfb7d562c2427e6c01e (diff) | |
| download | CMake-d8e5d9240cd0ffcf3af79bd54dd22f60e49e2415.zip CMake-d8e5d9240cd0ffcf3af79bd54dd22f60e49e2415.tar.gz CMake-d8e5d9240cd0ffcf3af79bd54dd22f60e49e2415.tar.bz2 | |
Merge topic 'test-ExternalProject-fs-delay'
e46e4ee96a Tests: Fix RunCMake.ExternalProject filesystem delay for Borland Makefiles
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7323
Diffstat (limited to 'Tests')
| -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() |