From 996fc21020b9a1ba4d8f22b01f1d08cab3fa8a08 Mon Sep 17 00:00:00 2001
From: Aiden Woodruff <aiden.woodruff@kitware.com>
Date: Fri, 7 Aug 2026 12:44:51 -0400
Subject: [PATCH] Tests: Enable toolchain parts of RunCMake.CompilerChange on
 Windows

A regression was missed partially due to this suite's condition. The
compiler specific pieces still need this condition because a shell
script needs to pretend to be a compiler, but the toolchain parts are
platform agnostic.

Issue: #28024
---
 Tests/RunCMake/CMakeLists.txt                 |  4 +-
 .../CompilerChange/RunCMakeTest.cmake         | 84 ++++++++++---------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 1406ca291a..be7f7578f4 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -392,9 +392,7 @@ add_RunCMake_test(CMakeRelease -DCMake_TEST_JQ=${CMake_TEST_JQ})
 if(CMAKE_GENERATOR MATCHES "Make|Ninja")
   add_RunCMake_test(Color)
 endif()
-if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles|Ninja|FASTBuild")
-  add_RunCMake_test(CompilerChange)
-endif()
+add_RunCMake_test(CompilerChange)
 add_RunCMake_test(CompilerNotFound)
 if(DEFINED CMake_TEST_OBJC)
   list(APPEND CMake_TEST_LANG_VARS -DCMake_TEST_OBJC=${CMake_TEST_OBJC})
diff --git a/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake b/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
index c6b3767995..3d6546cc4c 100644
--- a/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
@@ -1,47 +1,49 @@
 include(RunCMake)
 
-# Detect the compiler in use in the current environment.
-run_cmake(FindCompiler)
-include(${RunCMake_BINARY_DIR}/FindCompiler-build/cc.cmake)
-if(NOT CMAKE_C_COMPILER)
-  message(FATAL_ERROR "FindCompiler provided no compiler!")
+if(UNIX AND "${RunCMake_GENERATOR}" MATCHES "Unix Makefiles|Ninja|FASTBuild")
+  # Detect the compiler in use in the current environment.
+  run_cmake(FindCompiler)
+  include(${RunCMake_BINARY_DIR}/FindCompiler-build/cc.cmake)
+  if(NOT CMAKE_C_COMPILER)
+    message(FATAL_ERROR "FindCompiler provided no compiler!")
+  endif()
+  if(NOT IS_ABSOLUTE "${CMAKE_C_COMPILER}")
+    message(FATAL_ERROR "FindCompiler provided non-absolute path \"${CMAKE_C_COMPILER}\"!")
+  endif()
+  if(NOT EXISTS "${CMAKE_C_COMPILER}")
+    message(FATAL_ERROR "FindCompiler provided non-existing path \"${CMAKE_C_COMPILER}\"!")
+  endif()
+
+  # Now that we have the full compiler path, hide CC.
+  unset(ENV{CC})
+
+  # Wrap around the real compiler so we can change the compiler
+  # path without changing the underlying compiler.
+  set(ccIn ${RunCMake_SOURCE_DIR}/cc.sh.in)
+  set(cc1 ${RunCMake_BINARY_DIR}/cc1.sh)
+  set(cc2 ${RunCMake_BINARY_DIR}/cc2.sh)
+  set(cc3 CMAKE_C_COMPILER-NOTFOUND)
+  configure_file(${ccIn} ${cc1} @ONLY)
+  configure_file(${ccIn} ${cc2} @ONLY)
+
+  block()
+    set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ChangeCompiler-build)
+    run_cmake_with_options(FirstCompiler -DCMAKE_C_COMPILER=${cc1})
+    set(RunCMake_TEST_NO_CLEAN 1)
+    run_cmake_with_options(SecondCompiler -DCMAKE_C_COMPILER=${cc2})
+    run_cmake_with_options(EmptyCompiler -DCMAKE_C_COMPILER=)
+  endblock()
+
+  block()
+    set(cc1_dot ${RunCMake_BINARY_DIR}/./cc1.sh)
+    set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CompilerPath-build)
+    set(RunCMake_TEST_VARIANT_DESCRIPTION "-step1")
+    run_cmake_with_options(CompilerPath "-DCMAKE_C_COMPILER=${cc1_dot}" -DCACHE_ENTRY=cached)
+    set(RunCMake_TEST_NO_CLEAN 1)
+    set(RunCMake_TEST_VARIANT_DESCRIPTION "-step2")
+    run_cmake_with_options(CompilerPath "-DCMAKE_C_COMPILER=${cc1_dot}")
+  endblock()
 endif()
-if(NOT IS_ABSOLUTE "${CMAKE_C_COMPILER}")
-  message(FATAL_ERROR "FindCompiler provided non-absolute path \"${CMAKE_C_COMPILER}\"!")
-endif()
-if(NOT EXISTS "${CMAKE_C_COMPILER}")
-  message(FATAL_ERROR "FindCompiler provided non-existing path \"${CMAKE_C_COMPILER}\"!")
-endif()
-
-# Now that we have the full compiler path, hide CC.
-unset(ENV{CC})
-
-# Wrap around the real compiler so we can change the compiler
-# path without changing the underlying compiler.
-set(ccIn ${RunCMake_SOURCE_DIR}/cc.sh.in)
-set(cc1 ${RunCMake_BINARY_DIR}/cc1.sh)
-set(cc2 ${RunCMake_BINARY_DIR}/cc2.sh)
-set(cc3 CMAKE_C_COMPILER-NOTFOUND)
-configure_file(${ccIn} ${cc1} @ONLY)
-configure_file(${ccIn} ${cc2} @ONLY)
-
-block()
-  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ChangeCompiler-build)
-  run_cmake_with_options(FirstCompiler -DCMAKE_C_COMPILER=${cc1})
-  set(RunCMake_TEST_NO_CLEAN 1)
-  run_cmake_with_options(SecondCompiler -DCMAKE_C_COMPILER=${cc2})
-  run_cmake_with_options(EmptyCompiler -DCMAKE_C_COMPILER=)
-endblock()
-
-block()
-  set(cc1_dot ${RunCMake_BINARY_DIR}/./cc1.sh)
-  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CompilerPath-build)
-  set(RunCMake_TEST_VARIANT_DESCRIPTION "-step1")
-  run_cmake_with_options(CompilerPath "-DCMAKE_C_COMPILER=${cc1_dot}" -DCACHE_ENTRY=cached)
-  set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_VARIANT_DESCRIPTION "-step2")
-  run_cmake_with_options(CompilerPath "-DCMAKE_C_COMPILER=${cc1_dot}")
-endblock()
 
 # Set up "toolchain" files
 file(WRITE "${RunCMake_BINARY_DIR}/foo.cmake" "set(toolchain_var foo)\n")