Skip to content

Commit a4dbc04

Browse files
committed
Add workspace name and path to the optional SWIFTBUILD_TRACE filewq
1 parent 7d1d8ed commit a4dbc04

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Sources/SWBBuildSystem/BuildOperation.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,11 +738,15 @@ package final class BuildOperation: BuildSystemOperation {
738738
struct SwiftDataTraceEntry: Codable {
739739
let buildDescriptionSignature: String
740740
let isTargetParallelizationEnabled: Bool
741+
let name: String
742+
let path: String
741743
}
742744
do {
743745
let traceEntry = SwiftDataTraceEntry(
744746
buildDescriptionSignature: buildDescription.signature.asString,
745-
isTargetParallelizationEnabled: request.useParallelTargets
747+
isTargetParallelizationEnabled: request.useParallelTargets,
748+
name: workspace.name,
749+
path: workspace.path.str
746750
)
747751
let encoder = JSONEncoder(outputFormatting: .sortedKeys)
748752
try fs.append(swiftBuildTraceFilePath, contents: ByteString(encoder.encode(traceEntry)) + "\n")

Tests/SWBBuildSystemTests/SwiftBuildTraceTests.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ fileprivate struct SwiftBuildTraceTests: CoreBasedTests {
7171
}
7272

7373
let trace = try tester.fs.read(tmpDirPath.join(".SWIFTBUILD_TRACE")).asString
74-
#expect(try #/\{\"buildDescriptionSignature\":\".*\",\"isTargetParallelizationEnabled\":true\}\n\{\"buildDescriptionSignature\":\".*\",\"isTargetParallelizationEnabled\":true\}\n/#.wholeMatch(in: trace) != nil)
74+
print(trace)
75+
#expect(try #/\{\"buildDescriptionSignature\":\".*\",\"isTargetParallelizationEnabled\":true,\"name\":\"Test\",\"path\":\".*\"\}\n\{\"buildDescriptionSignature\":\".*\",\"isTargetParallelizationEnabled\":true,\"name\":\"Test\",\"path\":\".*\"\}\n/#.wholeMatch(in: trace) != nil)
7576
}
7677
}
7778
}

0 commit comments

Comments
 (0)