From 4daf96a1ebbb5b0c1f91eb5cdc679987981df368 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 2 Nov 2026 10:42:18 -0500 Subject: [PATCH] Tests/RunCMake/Codegen: Fix rebuild cases on make tools with 1s resolution Revise a test from commit 36fcfb3e01 (Tests/RunCMake/Codegen: Extend coverage, 2026-10-25, v4.5.0-rc2~4^2) to pass more reliably on such `make` tools. --- Tests/RunCMake/Codegen/RunCMakeTest.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Tests/RunCMake/Codegen/RunCMakeTest.cmake b/Tests/RunCMake/Codegen/RunCMakeTest.cmake index 5a74df145e..b9f4623197 100644 --- a/Tests/RunCMake/Codegen/RunCMakeTest.cmake +++ b/Tests/RunCMake/Codegen/RunCMakeTest.cmake @@ -1,5 +1,12 @@ include(RunCMake) +if(RunCMake_GENERATOR STREQUAL "Borland Makefiles" OR + RunCMake_GENERATOR STREQUAL "Watcom WMake") + set(fs_delay 3) +else() + set(fs_delay 1.125) +endif() + function(run_codegen case) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build) @@ -65,10 +72,11 @@ block() set(RunCMake_TEST_NO_CLEAN 1) run_cmake_command(rebuild-build1 ${CMAKE_COMMAND} --build . --target codegen --config Debug) # Make the output newer than its input but with different content. + execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${fs_delay}) file(WRITE ${RunCMake_TEST_BINARY_DIR}/generated.h "stale") run_cmake_command(rebuild-build2 ${CMAKE_COMMAND} --build . --target codegen --config Debug) # Ensure the input is newer than the output. - execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1) + execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${fs_delay}) file(WRITE ${RunCMake_TEST_BINARY_DIR}/input.txt "2") run_cmake_command(rebuild-build3 ${CMAKE_COMMAND} --build . --target codegen --config Debug) endblock()