Skip to content

SwiftPM outputs raw diagnostics from SwiftDriver without trailing newlines [5968] #5987

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.

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

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
2 changes: 1 addition & 1 deletion Sources/Build/SwiftCompilerOutputParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ extension SwiftCompilerOutputParser: JSONMessageStreamingParserDelegate {
return
}

let message = SwiftCompilerMessage(name: "unknown", kind: .unparsableOutput(text))
let message = SwiftCompilerMessage(name: "unknown", kind: .unparsableOutput(text + "\n"))
delegate?.swiftCompilerOutputParser(self, didParse: message)
}

Expand Down
2 changes: 1 addition & 1 deletion Tests/BuildTests/SwiftCompilerOutputParserTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class SwiftCompilerOutputParserTests: XCTestCase {
""".utf8)
delegate.assert(messages: [
SwiftCompilerMessage(name: "unknown", kind: .unparsableOutput("2A"))
SwiftCompilerMessage(name: "unknown", kind: .unparsableOutput("2A\n"))
], errorDescription: nil)

parser.parse(bytes: """
Expand Down
12 changes: 12 additions & 0 deletions Tests/CommandsTests/BuildToolTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,16 @@ final class BuildToolTests: CommandsTestCase {
XCTAssertMatch(output, .prefix("digraph Jobs {"))
}
}

func testSwiftDriverRawOutputGetsNewlines() throws {
try fixture(name: "DependencyResolution/Internal/Simple") { fixturePath in
// Building with `-wmo` should result in a `remark: Incremental compilation has been disabled: it is not compatible with whole module optimization` message, which should have a trailing newline. Since that message won't be there at all when the legacy compiler driver is used, we gate this check on whether the remark is there in the first place.
let result = try execute(["-c", "release", "-Xswiftc", "-wmo"], packagePath: fixturePath)
if result.stdout.contains("remark: Incremental compilation has been disabled: it is not compatible with whole module optimization") {
XCTAssertMatch(result.stdout, .contains("optimization\n"))
XCTAssertNoMatch(result.stdout, .contains("optimization["))
XCTAssertNoMatch(result.stdout, .contains("optimizationremark"))
}
}
}
}