From 50ce808ca75155c314462d2d3dbb30aeac55c2f0 Mon Sep 17 00:00:00 2001 From: Tyler Yankee Date: Wed, 13 May 2026 18:15:23 -0400 Subject: [PATCH] Tests: Move cache variable help string test Even though it doesn't necessarily reuse infrastructure, the other cases in `RunCMake.CacheNewlines` are covering more similar code to this case than those in `RunCMake.Configure`. --- .../{Configure => CacheNewline}/CacheVarHelpString.cmake | 0 Tests/RunCMake/CacheNewline/RunCMakeTest.cmake | 6 ++++++ Tests/RunCMake/Configure/RunCMakeTest.cmake | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) rename Tests/RunCMake/{Configure => CacheNewline}/CacheVarHelpString.cmake (100%) diff --git a/Tests/RunCMake/Configure/CacheVarHelpString.cmake b/Tests/RunCMake/CacheNewline/CacheVarHelpString.cmake similarity index 100% rename from Tests/RunCMake/Configure/CacheVarHelpString.cmake rename to Tests/RunCMake/CacheNewline/CacheVarHelpString.cmake diff --git a/Tests/RunCMake/CacheNewline/RunCMakeTest.cmake b/Tests/RunCMake/CacheNewline/RunCMakeTest.cmake index c5631c818f..f907c1b5c4 100644 --- a/Tests/RunCMake/CacheNewline/RunCMakeTest.cmake +++ b/Tests/RunCMake/CacheNewline/RunCMakeTest.cmake @@ -14,3 +14,9 @@ endfunction() run_cmake_cache_newline_test(CacheNewlines) run_cmake_cache_newline_test(CacheStartsWithNewline) run_cmake_cache_newline_test(CacheSingleNewline) + +block() + run_cmake(CacheVarHelpString) + set(RunCMake_TEST_NO_CLEAN 1) + run_cmake(CacheVarHelpString) +endblock() diff --git a/Tests/RunCMake/Configure/RunCMakeTest.cmake b/Tests/RunCMake/Configure/RunCMakeTest.cmake index b29640a411..0b65e8bd96 100644 --- a/Tests/RunCMake/Configure/RunCMakeTest.cmake +++ b/Tests/RunCMake/Configure/RunCMakeTest.cmake @@ -73,12 +73,6 @@ if(NOT RunCMake_GENERATOR MATCHES "^Ninja Multi-Config$") run_cmake(NoCMAKE_DEFAULT_CONFIGS) endif() -block() - run_cmake(CacheVarHelpString) - set(RunCMake_TEST_NO_CLEAN 1) - run_cmake(CacheVarHelpString) -endblock() - if(NOT CMAKE_HOST_WIN32) block() # Test a non-writable build directory.