Skip to content

[6.2.0] Fix crash when running swift test for swift-build #728

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 2 commits into from
Aug 13, 2025
Merged

[6.2.0] Fix crash when running swift test for swift-build #728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
187a16f
rdar://158239745 (Running `swift test` in `swift-build` crashes with …
owenv Aug 13, 2025
a82bf52
Fix issue encountered resolving merge conflict
rconnell9 Aug 13, 2025
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
96 changes: 54 additions & 42 deletions Sources/SWBUtil/Process.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,61 +82,73 @@ extension Process {
extension Process {
public static func getOutput(url: URL, arguments: [String], currentDirectoryURL: URL? = nil, environment: Environment? = nil, interruptible: Bool = true) async throws -> Processes.ExecutionResult {
if #available(macOS 15, iOS 18, tvOS 18, watchOS 11, visionOS 2, *) {
let stdoutPipe = Pipe()
let stderrPipe = Pipe()

// Extend the lifetime of the pipes to avoid file descriptors being closed until the AsyncStream is finished being consumed.
return try await withExtendedLifetime((Pipe(), Pipe())) { (stdoutPipe, stderrPipe) in
let (exitStatus, output) = try await _getOutput(url: url, arguments: arguments, currentDirectoryURL: currentDirectoryURL, environment: environment, interruptible: interruptible) { process in
let stdoutStream = process.makeStream(for: \.standardOutputPipe, using: stdoutPipe)
let stderrStream = process.makeStream(for: \.standardErrorPipe, using: stderrPipe)
return (stdoutStream, stderrStream)
} collect: { (stdoutStream, stderrStream) in
let stdoutData = try await stdoutStream.collect()
let stderrData = try await stderrStream.collect()
return (stdoutData: stdoutData, stderrData: stderrData)
}
return Processes.ExecutionResult(exitStatus: exitStatus, stdout: Data(output.stdoutData), stderr: Data(output.stderrData))
defer { withExtendedLifetime(stdoutPipe) {} }
defer { withExtendedLifetime(stderrPipe) {} }

let (exitStatus, output) = try await _getOutput(url: url, arguments: arguments, currentDirectoryURL: currentDirectoryURL, environment: environment, interruptible: interruptible) { process in
let stdoutStream = process.makeStream(for: \.standardOutputPipe, using: stdoutPipe)
let stderrStream = process.makeStream(for: \.standardErrorPipe, using: stderrPipe)
return (stdoutStream, stderrStream)
} collect: { (stdoutStream, stderrStream) in
let stdoutData = try await stdoutStream.collect()
let stderrData = try await stderrStream.collect()
return (stdoutData: stdoutData, stderrData: stderrData)
}
return Processes.ExecutionResult(exitStatus: exitStatus, stdout: Data(output.stdoutData), stderr: Data(output.stderrData))
} else {
let stdoutPipe = Pipe()
let stderrPipe = Pipe()

// Extend the lifetime of the pipes to avoid file descriptors being closed until the AsyncStream is finished being consumed.
return try await withExtendedLifetime((Pipe(), Pipe())) { (stdoutPipe, stderrPipe) in
let (exitStatus, output) = try await _getOutput(url: url, arguments: arguments, currentDirectoryURL: currentDirectoryURL, environment: environment, interruptible: interruptible) { process in
let stdoutStream = process._makeStream(for: \.standardOutputPipe, using: stdoutPipe)
let stderrStream = process._makeStream(for: \.standardErrorPipe, using: stderrPipe)
return (stdoutStream, stderrStream)
} collect: { (stdoutStream, stderrStream) in
let stdoutData = try await stdoutStream.collect()
let stderrData = try await stderrStream.collect()
return (stdoutData: stdoutData, stderrData: stderrData)
}
return Processes.ExecutionResult(exitStatus: exitStatus, stdout: Data(output.stdoutData), stderr: Data(output.stderrData))
defer { withExtendedLifetime(stdoutPipe) {} }
defer { withExtendedLifetime(stderrPipe) {} }

let (exitStatus, output) = try await _getOutput(url: url, arguments: arguments, currentDirectoryURL: currentDirectoryURL, environment: environment, interruptible: interruptible) { process in
let stdoutStream = process._makeStream(for: \.standardOutputPipe, using: stdoutPipe)
let stderrStream = process._makeStream(for: \.standardErrorPipe, using: stderrPipe)
return (stdoutStream, stderrStream)
} collect: { (stdoutStream, stderrStream) in
let stdoutData = try await stdoutStream.collect()
let stderrData = try await stderrStream.collect()
return (stdoutData: stdoutData, stderrData: stderrData)
}
return Processes.ExecutionResult(exitStatus: exitStatus, stdout: Data(output.stdoutData), stderr: Data(output.stderrData))
}
}

public static func getMergedOutput(url: URL, arguments: [String], currentDirectoryURL: URL? = nil, environment: Environment? = nil, interruptible: Bool = true) async throws -> (exitStatus: Processes.ExitStatus, output: Data) {
if #available(macOS 15, iOS 18, tvOS 18, watchOS 11, visionOS 2, *) {
// Extend the lifetime of the pipe to avoid file descriptors being closed until the AsyncStream is finished being consumed.
return try await withExtendedLifetime(Pipe()) { pipe in
let (exitStatus, output) = try await _getOutput(url: url, arguments: arguments, currentDirectoryURL: currentDirectoryURL, environment: environment, interruptible: interruptible) { process in
process.standardOutputPipe = pipe
process.standardErrorPipe = pipe
return pipe.fileHandleForReading.bytes(on: .global())
} collect: { stream in
try await stream.collect()
}
return (exitStatus: exitStatus, output: Data(output))
let pipe = Pipe()

// Extend the lifetime of the pipes to avoid file descriptors being closed until the AsyncStream is finished being consumed.
defer { withExtendedLifetime(pipe) {} }

let (exitStatus, output) = try await _getOutput(url: url, arguments: arguments, currentDirectoryURL: currentDirectoryURL, environment: environment, interruptible: interruptible) { process in
process.standardOutputPipe = pipe
process.standardErrorPipe = pipe
return pipe.fileHandleForReading.bytes(on: .global())
} collect: { stream in
try await stream.collect()
}
return (exitStatus: exitStatus, output: Data(output))
} else {
// Extend the lifetime of the pipe to avoid file descriptors being closed until the AsyncStream is finished being consumed.
return try await withExtendedLifetime(Pipe()) { pipe in
let (exitStatus, output) = try await _getOutput(url: url, arguments: arguments, currentDirectoryURL: currentDirectoryURL, environment: environment, interruptible: interruptible) { process in
process.standardOutputPipe = pipe
process.standardErrorPipe = pipe
return pipe.fileHandleForReading._bytes(on: .global())
} collect: { stream in
try await stream.collect()
}
return (exitStatus: exitStatus, output: Data(output))
let pipe = Pipe()

// Extend the lifetime of the pipes to avoid file descriptors being closed until the AsyncStream is finished being consumed.
defer { withExtendedLifetime(pipe) {} }

let (exitStatus, output) = try await _getOutput(url: url, arguments: arguments, currentDirectoryURL: currentDirectoryURL, environment: environment, interruptible: interruptible) { process in
process.standardOutputPipe = pipe
process.standardErrorPipe = pipe
return pipe.fileHandleForReading._bytes(on: .global())
} collect: { stream in
try await stream.collect()
}
return (exitStatus: exitStatus, output: Data(output))
}
}

Expand Down