Prereview cleanup

This commit is contained in:
Bartosz Polaczyk
2021-11-24 21:49:30 +01:00
parent e2f68c8f4e
commit d0b2bc0f71
3 changed files with 6 additions and 6 deletions
@@ -24,7 +24,7 @@ public struct SwiftcContext {
case producer
/// Commit sha of the commit to use during remote cache
case consumer(commit: RemoteCommitInfo)
/// Remote artifact exists and can be optimistically used in lieu of a local compilation
/// Remote artifact exists and can be optimistically used in place of a local compilation
case producerFast
}
@@ -35,7 +35,7 @@ class ThinningCreatorPluginTests: FileXCTestCase {
try fileManager.spt_createEmptyDir(currentTargetTempDir)
plugin = ThinningCreatorPlugin(
targetTempDir: currentTargetTempDir,
modeMarkerPath: "rc.enabled",
modeMarkerPath: "rc_marker.enabled",
dirScanner: FileManager.default)
}
@@ -79,7 +79,7 @@ class ThinningCreatorPluginTests: FileXCTestCase {
func testDefinesExtraMetaKeysForTargetsThatReusedArtifact() throws {
let otherTargetTempDir = targetTempDirRoot.appendingPathComponent("Other.build")
let marker = otherTargetTempDir.appendingPathComponent("rc.enabled")
let marker = otherTargetTempDir.appendingPathComponent("rc_marker.enabled")
let reusedArtifact = otherTargetTempDir
.appendingPathComponent("xccache")
.appendingPathComponent("123")
@@ -94,7 +94,7 @@ class ThinningCreatorPluginTests: FileXCTestCase {
func testFailsGeneratingExtraMetaKeysForTwoArtifactsInTargetTempDir() throws {
let otherTargetTempDir = targetTempDirRoot.appendingPathComponent("Other.build")
let marker = otherTargetTempDir.appendingPathComponent("rc.enabled")
let marker = otherTargetTempDir.appendingPathComponent("rc_marker.enabled")
let reusedArtifact1 = otherTargetTempDir
.appendingPathComponent("xccache")
.appendingPathComponent("001")
@@ -119,7 +119,7 @@ class ThinningCreatorPluginTests: FileXCTestCase {
.appendingPathExtension("zip")
try fileManager.spt_createEmptyFile(generatedArtifact)
let reusedTargetTempDir = targetTempDirRoot.appendingPathComponent("Reused.build")
let marker = reusedTargetTempDir.appendingPathComponent("rc.enabled")
let marker = reusedTargetTempDir.appendingPathComponent("rc_marker.enabled")
let reusedArtifact = reusedTargetTempDir
.appendingPathComponent("xccache")
.appendingPathComponent("999")
@@ -211,7 +211,7 @@ class SwiftcOrchestratorTests: XCTestCase {
XCTAssertEqual(artifactBuilder.addedObjCHeaders, ["archTest": [objcHeaderURL]])
}
func testSuccessedMockInProducerFastModeModeDoesntFillObjCHeader() throws {
func testSuccessedMockInProducerFastModeDoesntFillObjCHeader() throws {
let swiftc = SwiftcMock(mockingResult: .success)
let orchestrator = SwiftcOrchestrator(
mode: .producerFast,