Skip to content

Parse XCbuild stderr only if stdout is empty #3584

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

Merged
merged 4 commits into from
Jul 9, 2021
Merged

Parse XCbuild stderr only if stdout is empty #3584

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3103596
Parse stderr from XCBuild only if stdout is empty
elsh Jun 30, 2021
8696925
cleanup
elsh Jul 7, 2021
af21cea
Use stream instead of collect
elsh Jul 8, 2021
163916c
format
elsh Jul 9, 2021
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
17 changes: 15 additions & 2 deletions Sources/XCBuildSupport/XcodeBuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,13 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {
arguments += buildParameters.xcbuildFlags

let delegate = createBuildDelegate()
let redirection: Process.OutputRedirection = .stream(stdout: delegate.parse(bytes:), stderr: { bytes in
self.diagnostics.emit(StringError(String(bytes: bytes, encoding: .utf8)!))
var hasStdout = false
var stderrBuffer: [UInt8] = []
let redirection: Process.OutputRedirection = .stream(stdout: { bytes in
hasStdout = hasStdout || !bytes.isEmpty
delegate.parse(bytes: bytes)
}, stderr: { bytes in
stderrBuffer.append(contentsOf: bytes)
})

let process = Process(arguments: arguments, outputRedirection: redirection)
Expand All @@ -119,6 +124,14 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {
guard result.exitStatus == .terminated(code: 0) else {
throw Diagnostics.fatalError
}

if !hasStdout {
if !stderrBuffer.isEmpty {
diagnostics.emit(StringError(String(decoding: stderrBuffer, as: UTF8.self)))
} else {
diagnostics.emit(StringError("Unknown error: stdout and stderr are empty"))
}
}
}

func createBuildParametersFile() throws -> AbsolutePath? {
Expand Down