Skip to content

Commit 9dd25e0

Browse files
committed
Handle the "abnormal-exit" status kind from the Swift compiler's parseable output
This is used on Windows.
1 parent 27e218d commit 9dd25e0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Sources/Build/LLBuildProgressTracker.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ private struct CommandTaskTracker {
545545
}
546546

547547
self.finishedCount += 1
548-
case .unparsableOutput, .signalled, .skipped:
548+
case .unparsableOutput, .abnormal, .signalled, .skipped:
549549
break
550550
}
551551
}
@@ -610,14 +610,15 @@ extension SwiftCompilerMessage {
610610
switch kind {
611611
case .began(let info):
612612
([info.commandExecutable] + info.commandArguments).joined(separator: " ")
613-
case .skipped, .finished, .signalled, .unparsableOutput:
613+
case .skipped, .finished, .abnormal, .signalled, .unparsableOutput:
614614
nil
615615
}
616616
}
617617

618618
fileprivate var standardOutput: String? {
619619
switch kind {
620620
case .finished(let info),
621+
.abnormal(let info),
621622
.signalled(let info):
622623
info.output
623624
case .unparsableOutput(let output):

Sources/Build/SwiftCompilerOutputParser.swift

+3
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public struct SwiftCompilerMessage {
7373
case began(BeganInfo)
7474
case skipped(SkippedInfo)
7575
case finished(OutputInfo)
76+
case abnormal(OutputInfo)
7677
case signalled(OutputInfo)
7778
case unparsableOutput(String)
7879
}
@@ -201,6 +202,8 @@ extension SwiftCompilerMessage.Kind: Decodable, Equatable {
201202
self = try .skipped(SkippedInfo(from: decoder))
202203
case "finished":
203204
self = try .finished(OutputInfo(from: decoder))
205+
case "abnormal-exit":
206+
self = try .abnormal(OutputInfo(from: decoder))
204207
case "signalled":
205208
self = try .signalled(OutputInfo(from: decoder))
206209
default:

0 commit comments

Comments
 (0)