Merge pull request #1812 from cachemeifyoucan/fix-early-termination

cachemeifyoucan · web-flow · commit ff07a06e6aa7 · 2025-02-19T15:31:56.000-08:00
[Tests] Fix another early termination in tests
diff --git a/Tests/SwiftDriverTests/CachingBuildTests.swift b/Tests/SwiftDriverTests/CachingBuildTests.swift
@@ -720,13 +720,13 @@ final class CachingBuildTests: XCTestCase {
                               interModuleDependencyOracle: dependencyOracle)
       let jobs = try driver.planBuild()
       for job in jobs {
-          XCTAssertFalse(job.outputCacheKeys.isEmpty)
+        XCTAssertFalse(job.outputCacheKeys.isEmpty)
       }
-      if driver.isFrontendArgSupported(.importPch) {
-          XCTAssertTrue(jobs.contains { $0.kind == .generatePCH })
+      if driver.isFrontendArgSupported(.autoBridgingHeaderChaining) {
+        XCTAssertTrue(jobs.contains { $0.kind == .generatePCH })
+        try driver.run(jobs: jobs)
+        XCTAssertFalse(driver.diagnosticEngine.hasErrors)
       }
-      try driver.run(jobs: jobs)
-      XCTAssertFalse(driver.diagnosticEngine.hasErrors)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -720,13 +720,13 @@ final class CachingBuildTests: XCTestCase {`
`720`	`720`	`interModuleDependencyOracle: dependencyOracle)`
`721`	`721`	`let jobs = try driver.planBuild()`
`722`	`722`	`for job in jobs {`
`723`		`- XCTAssertFalse(job.outputCacheKeys.isEmpty)`
	`723`	`+ XCTAssertFalse(job.outputCacheKeys.isEmpty)`
`724`	`724`	`}`
`725`		`- if driver.isFrontendArgSupported(.importPch) {`
`726`		`- XCTAssertTrue(jobs.contains { $0.kind == .generatePCH })`
	`725`	`+ if driver.isFrontendArgSupported(.autoBridgingHeaderChaining) {`
	`726`	`+ XCTAssertTrue(jobs.contains { $0.kind == .generatePCH })`
	`727`	`+ try driver.run(jobs: jobs)`
	`728`	`+ XCTAssertFalse(driver.diagnosticEngine.hasErrors)`
`727`	`729`	`}`
`728`		`- try driver.run(jobs: jobs)`
`729`		`- XCTAssertFalse(driver.diagnosticEngine.hasErrors)`
`730`	`730`	`}`
`731`	`731`	`}`
`732`	`732`