Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Sources/SwiftBuildSupport/SwiftBuildSystem.swift
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,20 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
}
}

for sanitizer in buildParameters.sanitizers.sanitizers {
self.observabilityScope.emit(debug:"Enabling \(sanitizer) sanitizer")
switch sanitizer {
case .address:
settings["ENABLE_ADDRESS_SANITIZER"] = "YES"
case .thread:
settings["ENABLE_THREAD_SANITIZER"] = "YES"
case .undefined:
settings["ENABLE_UNDEFINED_BEHAVIOR_SANITIZER"] = "YES"
case .fuzzer, .scudo:
throw StringError("\(sanitizer) is not currently supported with this build system.")
}
}

// FIXME: workaround for old Xcode installations such as what is in CI
settings["LM_SKIP_METADATA_EXTRACTION"] = "YES"
if let symbolGraphOptions {
Expand Down
6 changes: 4 additions & 2 deletions Sources/_InternalTestSupport/MockBuildTestHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ public func mockBuildParameters(
linkTimeOptimizationMode: BuildParameters.LinkTimeOptimizationMode? = nil,
omitFramePointers: Bool? = nil,
enableXCFrameworksOnLinux: Bool = false,
prepareForIndexing: BuildParameters.PrepareForIndexingMode = .off
prepareForIndexing: BuildParameters.PrepareForIndexingMode = .off,
sanitizers: [Sanitizer] = [],
) -> BuildParameters {
try! BuildParameters(
destination: destination,
Expand All @@ -104,6 +105,7 @@ public func mockBuildParameters(
buildSystemKind: buildSystemKind,
pkgConfigDirectories: [],
workers: 3,
sanitizers: EnabledSanitizers(Set(sanitizers)),
indexStoreMode: indexStoreMode,
prepareForIndexing: prepareForIndexing,
enableXCFrameworksOnLinux: enableXCFrameworksOnLinux,
Expand All @@ -120,7 +122,7 @@ public func mockBuildParameters(
linkTimeOptimizationMode: linkTimeOptimizationMode,
shouldDisableLocalRpath: shouldDisableLocalRpath,
shouldLinkStaticSwiftStdlib: shouldLinkStaticSwiftStdlib
)
),
)
}

Expand Down
11 changes: 6 additions & 5 deletions Sources/_InternalTestSupport/SwiftTesting+Tags.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ extension Tag.Platform {
@Tag public static var FileSystem: Tag
}

extension Tag.FunctionalArea {
@Tag public static var PIF: Tag
@Tag public static var IndexMode: Tag
@Tag public static var Sanitizer: Tag
}

extension Tag.Feature {
public enum Command {}
public enum CommandLineArguments {}
Expand Down Expand Up @@ -192,8 +198,3 @@ extension Tag.Feature.Product {
@Tag public static var Execute: Tag
@Tag public static var Link: Tag
}

extension Tag.FunctionalArea {
@Tag public static var PIF: Tag
@Tag public static var IndexMode: Tag
}
3 changes: 2 additions & 1 deletion Tests/CommandsTests/Sanitizer+ExtensionsTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import enum PackageModel.Sanitizer

@Suite(
.tags(
Tag.TestSize.small,
.TestSize.small,
.FunctionalArea.Sanitizer,
),
)
struct SanitizerExtensionTests {
Expand Down
2 changes: 1 addition & 1 deletion Tests/SwiftBuildSupportTests/PIFBuilderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ struct PIFBuilderTests {
let releaseConfig = try pif.workspace
.project(named: "BasicExecutable")
.target(named: "Executable")
.buildConfig(named: "Release")
.buildConfig(named: .release)

for platform in ProjectModel.BuildSettings.Platform.allCases {
let search_paths = releaseConfig.impartedBuildProperties.settings[.LIBRARY_SEARCH_PATHS, platform]
Expand Down
77 changes: 77 additions & 0 deletions Tests/SwiftBuildSupportTests/SwiftBuildSystemTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,90 @@ func withInstantiatedSwiftBuildSystem(
}
}

extension PackageModel.Sanitizer {
var hasSwiftBuildSupport: Bool {
switch self {
case .address, .thread, .undefined: true
case .fuzzer, .scudo: false
}
}

var swiftBuildSettingName: String? {
switch self {
case .address: "ENABLE_ADDRESS_SANITIZER"
case .thread: "ENABLE_THREAD_SANITIZER"
case .undefined: "ENABLE_UNDEFINED_BEHAVIOR_SANITIZER"
case .fuzzer, .scudo: nil
}

}
}

@Suite(
.tags(
.TestSize.medium,
),
)
struct SwiftBuildSystemTests {

@Suite(
.tags(
.FunctionalArea.Sanitizer,
)
)
struct SanitizerTests {

@Test(
arguments: PackageModel.Sanitizer.allCases.filter { $0.hasSwiftBuildSupport },
)
func sanitizersSettingSetCorrectBuildRequest(
sanitizer: Sanitizer,
) async throws {
try await withInstantiatedSwiftBuildSystem(
fromFixture: "PIFBuilder/Simple",
buildParameters: mockBuildParameters(
destination: .host,
sanitizers: [sanitizer],
),
) { swiftBuild, session, observabilityScope, buildParameters in
let buildSettings: SWBBuildParameters = try await swiftBuild.makeBuildParameters(
session: session,
symbolGraphOptions: nil,
setToolchainSetting: false, // Set this to false as SwiftBuild checks the toolchain path
)

let synthesizedArgs = try #require(buildSettings.overrides.synthesized)

let swbSettingName = try #require(sanitizer.swiftBuildSettingName)
#expect(synthesizedArgs.table[swbSettingName] == "YES")
}

}

@Test(
arguments: PackageModel.Sanitizer.allCases.filter { !$0.hasSwiftBuildSupport },
)
func unsupportedSanitizersRaisesError(
sanitizer: Sanitizer,
) async throws {
try await withInstantiatedSwiftBuildSystem(
fromFixture: "PIFBuilder/Simple",
buildParameters: mockBuildParameters(
destination: .host,
sanitizers: [sanitizer],
),
) { swiftBuild, session, observabilityScope, buildParameters in
await #expect(throws: (any Error).self) {
try await swiftBuild.makeBuildParameters(
session: session,
symbolGraphOptions: nil,
setToolchainSetting: false, // Set this to false as SwiftBuild checks the toolchain path
)
}
}
}
}

@Test(
arguments: BuildParameters.IndexStoreMode.allCases,
// arguments: [BuildParameters.IndexStoreMode.on],
Expand Down