[TEST-ONLY] Update compilation caching tests for latest compilers

Update compilation caching tests to work with latest compiler. This
involves relaxing some tests to check for both old and new command-line
and also encoding less compiler implementation details in the build
system tests.

Author: cachemeifyoucan

Tests/SWBBuildSystemTests/ClangCompilationCachingTests.swift

@@ -1576,10 +1576,10 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                 XCTAssertMatch(output.stringValue, .contains(#"-isysroot /\^sdk"#))
                 XCTAssertMatch(output.stringValue, .contains(#"-resource-dir /\^toolchain/usr/lib/clang/"#))
             }
-            func checkModuleCommandLine(task: Task, results: BuildOperationTester.BuildResults, name: String) {
+            func checkModuleCommandLine(task: Task, results: BuildOperationTester.BuildResults, name: String) throws {
                 // The final command-line is only known to the dynamic task, but it's printed to output so we can check that.
-                results.checkTaskOutput(task) { output in
-                    XCTAssertMatch(output.stringValue, .contains(#"\#(name)\=/\^mod"#))
+                try results.checkTaskOutput(task) { output in
+                    XCTAssertMatch(output.stringValue, .or(.contains(#"\#(name)\=/\^mod"#), .contains(#"\#(name) /\^mod"#)))
                     checkCommandLineCommon(output: output)
                 }
             }
@@ -1596,7 +1596,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                 results.checkCompileCacheMiss(moduleTask)
                 results.checkCompileCacheMiss(tuTask)
                 results.checkNoDiagnostics()
-                checkModuleCommandLine(task: moduleTask, results: results, name: "Mod1")
+                try checkModuleCommandLine(task: moduleTask, results: results, name: "Mod1")
                 checkTUCommandLine(task: tuTask, results: results)
             }
 
@@ -1607,7 +1607,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                 results.checkCompileCacheHit(moduleTask)
                 results.checkCompileCacheHit(tuTask)
                 results.checkNoDiagnostics()
-                checkModuleCommandLine(task: moduleTask, results: results, name: "Mod2")
+                try checkModuleCommandLine(task: moduleTask, results: results, name: "Mod2")
                 checkTUCommandLine(task: tuTask, results: results)
             }
         }
@@ -1842,6 +1842,7 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
                 "CLANG_ENABLE_COMPILE_CACHE": enableCaching ? "YES" : "NO",
                 "CLANG_ENABLE_MODULES": "NO",
                 "COMPILATION_CACHE_CAS_PATH": casPath.str,
+                "DSTROOT": tmpDirPath.join("dstroot").str,
             ]
             if usePlugin {
                 buildSettings["COMPILATION_CACHE_ENABLE_PLUGIN"] = "YES"
@@ -1966,7 +1967,11 @@ fileprivate struct ClangCompilationCachingTests: CoreBasedTests {
             // Ignore output for plugin CAS since it may not yet support validation.
             try await checkBuild("validated successfully\n")
             // Create an error and trigger revalidation by messing with the validation data.
-            try tester.fs.move(casPath.join("builtin/v1.1/v8.data"), to: casPath.join("builtin/v1.1/v8.data.moved"))
+            let dataDir = casPath.join("builtin").join("v1.1")
+            let dataFile = try #require(tester.fs.listdir(dataDir).first {
+                $0.hasSuffix(".data") && $0.hasPrefix("v")
+            })
+            try tester.fs.move(dataDir.join(dataFile), to: dataDir.join("moved"))
             try await tester.fs.writeFileContents(casPath.join("builtin/v1.validation")) { stream in
                 stream <<< "0"
             }