Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suppress warnings for remote Clang targets #7423

Merged
merged 2 commits into from Mar 27, 2024
Merged

Suppress warnings for remote Clang targets #7423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
398dab8
Suppress warnings for remote Clang targets
xedin Mar 25, 2024
08efdf5
NFC: Add a test-case for `-w` in clang arguments for "remote" packages
xedin Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions Sources/Build/BuildDescription/ClangTargetBuildDescription.swift
View file
Open in desktop
Expand Up @@ -323,6 +323,15 @@ package final class ClangTargetBuildDescription {
args += ["-I", toolchainResourcesPath.pathString]
}

// suppress warnings if the package is remote
if self.package.isRemote {
args += ["-w"]
// `-w` (suppress warnings) and `-Werror` (warnings as errors) flags are mutually exclusive
if let index = args.firstIndex(of: "-Werror") {
args.remove(at: index)
}
}

return args
}

Expand Down
24 changes: 18 additions & 6 deletions Tests/BuildTests/ClangTargetBuildDescriptionTests.swift
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ final class ClangTargetBuildDescriptionTests: XCTestCase {
func testClangIndexStorePath() throws {
let targetDescription = try makeTargetBuildDescription("test")
XCTAssertTrue(try targetDescription.basicArguments().contains("-index-store-path"))
XCTAssertFalse(try targetDescription.basicArguments().contains("-w"))
}

func testSwiftCorelibsFoundationIncludeWorkaround() throws {
Expand All @@ -45,6 +46,11 @@ final class ClangTargetBuildDescriptionTests: XCTestCase {
XCTAssertTrue(try androidDescription.basicArguments().contains("\(androidParameters.toolchain.swiftResourcesPath!)"))
}

func testWarningSuppressionForRemotePackages() throws {
let targetDescription = try makeTargetBuildDescription("test-warning-supression", usesSourceControl: true)
XCTAssertTrue(try targetDescription.basicArguments().contains("-w"))
}

private func makeClangTarget() throws -> ClangTarget {
try ClangTarget(
name: "dummy",
Expand All @@ -70,14 +76,20 @@ final class ClangTargetBuildDescriptionTests: XCTestCase {
}

private func makeTargetBuildDescription(_ packageName: String,
buildParameters: BuildParameters? = nil) throws -> ClangTargetBuildDescription {
buildParameters: BuildParameters? = nil,
usesSourceControl: Bool = false) throws -> ClangTargetBuildDescription {
let observability = ObservabilitySystem.makeForTesting(verbose: false)

let manifest = Manifest.createRootManifest(
displayName: "dummy",
toolsVersion: .v5,
targets: [try TargetDescription(name: "dummy")]
)
let manifest: Manifest
if usesSourceControl {
manifest = Manifest.createLocalSourceControlManifest(
displayName: packageName, path: AbsolutePath("/\(packageName)"))
} else {
manifest = Manifest.createRootManifest(
displayName: packageName,
toolsVersion: .v5,
targets: [try TargetDescription(name: "dummy")])
}

let target = try makeResolvedTarget()

Expand Down