Skip to content

Commit e27b9f0

Browse files
committed
Fix merge conflict build issues
1 parent d48db30 commit e27b9f0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Sources/Commands/SwiftTestCommand.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
421421
let toolchain = try swiftCommandState.getTargetToolchain()
422422
let testEnv = try TestingSupport.constructTestEnvironment(
423423
toolchain: toolchain,
424-
destinationBuildParameters: productsBuildParameters,
424+
buildParameters: productsBuildParameters,
425425
sanitizers: globalOptions.build.sanitizers,
426426
library: library
427427
)
@@ -703,7 +703,7 @@ extension SwiftTestCommand {
703703
let toolchain = try swiftCommandState.getTargetToolchain()
704704
let testEnv = try TestingSupport.constructTestEnvironment(
705705
toolchain: toolchain,
706-
destinationBuildParameters: productsBuildParameters,
706+
buildParameters: productsBuildParameters,
707707
sanitizers: globalOptions.build.sanitizers,
708708
library: .swiftTesting
709709
)
@@ -1016,7 +1016,7 @@ final class ParallelTestRunner {
10161016

10171017
let testEnv = try TestingSupport.constructTestEnvironment(
10181018
toolchain: self.toolchain,
1019-
destinationBuildParameters: self.productsBuildParameters,
1019+
buildParameters: self.productsBuildParameters,
10201020
sanitizers: self.buildOptions.sanitizers,
10211021
library: .xctest // swift-testing does not use ParallelTestRunner
10221022
)

0 commit comments

Comments
 (0)