Merge pull request #84253 from edymtt/edymtt/fix-build-system-test-failures-6.2

[6.2] fix build system tests that assume CMake is in the search path

Author: edymtt

utils/swift_build_support/tests/test_toolchain.py

@@ -53,9 +53,8 @@ def test_misc_tools(self):
         tc = host_toolchain()
 
         # CMake
-        self.assertIsNotNone(tc.cmake)
-        self.assertTrue(
-            os.path.basename(tc.cmake).startswith('cmake'))
+        self.assertTrue(tc.cmake is None or
+                        os.path.basename(tc.cmake).startswith('cmake'))
 
         # Ninja
         self.assertTrue(tc.ninja is None or

validation-test/BuildSystem/build_worktree.test

@@ -12,7 +12,7 @@
 # RUN: git -C %t/swift worktree add --detach %t/swift-worktree
 
 # Invoke the build script from the worktree.
-# RUN: %t/swift-worktree/utils/build-script --dry-run | %FileCheck -DARCH=%target-arch %s
+# RUN: %t/swift-worktree/utils/build-script --dry-run --cmake %cmake | %FileCheck -DARCH=%target-arch %s
 
 # We should generate a build system for the linked worktree, not the main
 # worktree.