[TEST-ONLY] Fix compilation caching test

Fix the broken tests and mark them as not flaky.

Resolves: rdar://137717929

Author: cachemeifyoucan

Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift

@@ -18,9 +18,8 @@ import SWBTaskExecution
 import SWBTestSupport
 import SWBUtil
 
-@Suite(.skipHostOS(.windows), .requireCompilationCaching,
-    .requireDependencyScannerPlusCaching, // Windows: CAS creation failed: fatal error: CAS cannot be initialized from the specified '-fcas-*' options: OnDiskCache is disabled
-       .flaky("A handful of Swift Build CAS tests fail when running the entire test suite"), .bug("rdar://137717929"))
+@Suite(.skipHostOS(.windows, "Windows platform has no CAS support yet"),
+       .requireCompilationCaching, .requireDependencyScannerPlusCaching)
 fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
     let canUseCASPlugin: Bool
     let canUseCASPruning: Bool
@@ -338,6 +337,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                 "CCHROOT": cchrootPath.str,
                                 "CLANG_ENABLE_MODULES": "NO",
                                 "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
+                                "EMIT_FRONTEND_COMMAND_LINES": "YES",
                             ])],
                         targets: [
                             TestStandardTarget(
@@ -388,6 +388,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             "CLANG_ENABLE_COMPILE_CACHE": "YES",
             "CLANG_CACHE_FINE_GRAINED_OUTPUTS": "NO",
             "CLANG_CACHE_FINE_GRAINED_OUTPUTS_VERIFICATION": "NO",
+            "EMIT_FRONTEND_COMMAND_LINES": "YES",
         ]
 
         try await testCachingFineGrainedOutputsBasicNoMatch(buildSettings: buildSettings)
@@ -400,6 +401,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             "CLANG_ENABLE_COMPILE_CACHE": "NO",
             "CLANG_CACHE_FINE_GRAINED_OUTPUTS": "YES",
             "CLANG_CACHE_FINE_GRAINED_OUTPUTS_VERIFICATION": "YES",
+            "EMIT_FRONTEND_COMMAND_LINES": "YES",
         ]
 
         try await testCachingFineGrainedOutputsBasicNoMatch(buildSettings: buildSettings)
@@ -475,6 +477,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
         let buildSettings = [
             "PRODUCT_NAME": "$(TARGET_NAME)",
             "CLANG_ENABLE_COMPILE_CACHE": "YES",
+            "EMIT_FRONTEND_COMMAND_LINES": "YES",
         ]
 
         try await testCachingFineGrainedOutputsBasicMatch(buildSettings: buildSettings, checkVerification: false)
@@ -486,6 +489,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             "PRODUCT_NAME": "$(TARGET_NAME)",
             "CLANG_ENABLE_COMPILE_CACHE": "YES",
             "CLANG_CACHE_FINE_GRAINED_OUTPUTS": "YES",
+            "EMIT_FRONTEND_COMMAND_LINES": "YES",
         ]
 
         try await testCachingFineGrainedOutputsBasicMatch(buildSettings: buildSettings, checkVerification: false)
@@ -498,6 +502,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             "CLANG_ENABLE_COMPILE_CACHE": "YES",
             "CLANG_CACHE_FINE_GRAINED_OUTPUTS": "YES",
             "CLANG_CACHE_FINE_GRAINED_OUTPUTS_VERIFICATION": "YES",
+            "EMIT_FRONTEND_COMMAND_LINES": "YES",
         ]
 
         try await testCachingFineGrainedOutputsBasicMatch(buildSettings: buildSettings, checkVerification: true)
@@ -597,6 +602,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                 "BLOCKLISTS_PATH": tmpDirPath.str,
                                 "CLANG_ENABLE_MODULES": "NO",
                                 "CLANG_ENABLE_EXPLICIT_MODULES": "NO",
+                                "EMIT_FRONTEND_COMMAND_LINES": "YES",
                             ])],
                         targets: [
                             TestStandardTarget(
@@ -1525,6 +1531,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                                     "CLANG_ENABLE_PREFIX_MAPPING": "YES",
                                     "CLANG_OTHER_PREFIX_MAPPINGS": "\(moduleDir.str)=/^mod",
                                     "DSTROOT": tmpDirPath.join("dstroot").str,
+                                    "EMIT_FRONTEND_COMMAND_LINES": "YES",
                                 ])],
                             targets: [
                                 TestStandardTarget(

Tests/SWBBuildSystemTests/ClangModuleVerifierTests.swift

@@ -191,7 +191,7 @@ fileprivate struct ClangModuleVerifierTests: CoreBasedTests {
         }
     }
 
-    @Test(.requireSDKs(.macOS), .requireClangFeatures(.wSystemHeadersInModule), .requireDependencyScannerPlusCaching, .requireCompilationCaching, .flaky("A handful of Swift Build CAS tests fail when running the entire test suite"), .bug("rdar://137717929"))
+    @Test(.requireSDKs(.macOS), .requireClangFeatures(.wSystemHeadersInModule), .requireDependencyScannerPlusCaching, .requireCompilationCaching)
     func cachedBuild() async throws {
         try await withTemporaryDirectory { (tmpDirPath: Path) in
             let archs = ["arm64", "x86_64"]

Tests/SWBBuildSystemTests/SwiftCompilationCachingTests.swift

@@ -18,7 +18,7 @@ import SWBUtil
 
 import SWBTaskExecution
 
-@Suite(.requireSwiftFeatures(.compilationCaching), .requireCompilationCaching, .flaky("A handful of Swift Build CAS tests fail when running the entire test suite"), .bug("rdar://137717929"))
+@Suite(.requireSwiftFeatures(.compilationCaching), .requireCompilationCaching)
 fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
     @Test(.requireSDKs(.iOS))
     func swiftCachingSimple() async throws {
@@ -81,7 +81,7 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
             var numCompile = 0
             try await tester.checkBuild(runDestination: .anyiOSDevice, persistent: true) { results in
                 results.consumeTasksMatchingRuleTypes()
-                results.consumeTasksMatchingRuleTypes(["CopySwiftLibs", "GenerateDSYMFile", "ProcessInfoPlistFile", "RegisterExecutionPolicyException", "Touch", "Validate", "ExtractAppIntentsMetadata", "AppIntentsSSUTraining", "SwiftDriver Compilation Requirements", "Copy", "Ld", "CompileC", "SwiftMergeGeneratedHeaders"])
+                results.consumeTasksMatchingRuleTypes(["CopySwiftLibs", "GenerateDSYMFile", "ProcessInfoPlistFile", "RegisterExecutionPolicyException", "Touch", "Validate", "ExtractAppIntentsMetadata", "AppIntentsSSUTraining", "SwiftDriver Compilation Requirements", "Copy", "Ld", "CompileC", "SwiftMergeGeneratedHeaders", "ProcessSDKImports"])
 
                 results.checkTask(.matchTargetName("Application"), .matchRule(["SwiftDriver", "Application", "normal", "arm64", "com.apple.xcode.tools.swift.compiler"])) { task in
                     task.checkCommandLineMatches([.suffix("swiftc"), .anySequence, "-cache-compile-job", .anySequence])
@@ -110,15 +110,15 @@ fileprivate struct SwiftCompilationCachingTests: CoreBasedTests {
 
                 results.checkNoTask()
             }
-            #expect(try readMetrics("one") == "{\"clangCacheHits\":0,\"clangCacheMisses\":0,\"swiftCacheHits\":0,\"swiftCacheMisses\":\(numCompile)}")
+            #expect(try readMetrics("one").contains("\"swiftCacheHits\":0,\"swiftCacheMisses\":\(numCompile)"))
 
             // touch a file, clean build folder, and rebuild.
             try await tester.fs.updateTimestamp(testWorkspace.sourceRoot.join("aProject/App.swift"))
             try await tester.checkBuild(runDestination: .macOS, buildCommand: .cleanBuildFolder(style: .regular), body: { _ in })
 
             tester.userInfo = rawUserInfo.withAdditionalEnvironment(environment: metricsEnv("two"))
             try await tester.checkBuild(runDestination: .anyiOSDevice, persistent: true) { _ in }
-            #expect(try readMetrics("two") == "{\"clangCacheHits\":0,\"clangCacheMisses\":0,\"swiftCacheHits\":\(numCompile),\"swiftCacheMisses\":0}")
+            #expect(try readMetrics("two").contains("\"swiftCacheHits\":\(numCompile),\"swiftCacheMisses\":0"))
         }
     }
 }