@@ -108,7 +108,7 @@ final class TestDiscoveryCommand: CustomLLBuildCommand, TestBuildCommand {
108
108
try fileSystem. writeFileContents ( path, string: content)
109
109
}
110
110
111
- private func execute( fileSystem: Basics . FileSystem , tool: LLBuildManifest . TestDiscoveryTool ) throws {
111
+ private func execute( fileSystem: Basics . FileSystem , tool: TestDiscoveryTool ) throws {
112
112
let index = self . context. buildParameters. indexStore
113
113
let api = try self . context. indexStoreAPI. get ( )
114
114
let store = try IndexStore . open ( store: TSCAbsolutePath ( index) , api: api)
@@ -120,7 +120,7 @@ final class TestDiscoveryCommand: CustomLLBuildCommand, TestBuildCommand {
120
120
let testsByModule = Dictionary ( grouping: tests, by: { $0. module. spm_mangledToC99ExtendedIdentifier ( ) } )
121
121
122
122
func isMainFile( _ path: AbsolutePath ) -> Bool {
123
- path. basename == LLBuildManifest . TestDiscoveryTool. mainFileName
123
+ path. basename == TestDiscoveryTool . mainFileName
124
124
}
125
125
126
126
var maybeMainFile : AbsolutePath ?
@@ -152,7 +152,7 @@ final class TestDiscoveryCommand: CustomLLBuildCommand, TestBuildCommand {
152
152
}
153
153
154
154
guard let mainFile = maybeMainFile else {
155
- throw InternalError ( " main output ( \( LLBuildManifest . TestDiscoveryTool. mainFileName) ) not found " )
155
+ throw InternalError ( " main output ( \( TestDiscoveryTool . mainFileName) ) not found " )
156
156
}
157
157
158
158
let testsKeyword = tests. isEmpty ? " let " : " var "
@@ -200,7 +200,7 @@ final class TestDiscoveryCommand: CustomLLBuildCommand, TestBuildCommand {
200
200
}
201
201
202
202
final class TestEntryPointCommand : CustomLLBuildCommand , TestBuildCommand {
203
- private func execute( fileSystem: Basics . FileSystem , tool: LLBuildManifest . TestEntryPointTool ) throws {
203
+ private func execute( fileSystem: Basics . FileSystem , tool: TestEntryPointTool ) throws {
204
204
// Find the inputs, which are the names of the test discovery module(s)
205
205
let inputs = tool. inputs. compactMap { try ? AbsolutePath ( validating: $0. name) }
206
206
let discoveryModuleNames = inputs. map ( \. basenameWithoutExt)
@@ -209,9 +209,9 @@ final class TestEntryPointCommand: CustomLLBuildCommand, TestBuildCommand {
209
209
210
210
// Find the main output file
211
211
guard let mainFile = outputs. first ( where: { path in
212
- path. basename == LLBuildManifest . TestEntryPointTool. mainFileName
212
+ path. basename == TestEntryPointTool . mainFileName
213
213
} ) else {
214
- throw InternalError ( " main file output ( \( LLBuildManifest . TestEntryPointTool. mainFileName) ) not found " )
214
+ throw InternalError ( " main file output ( \( TestEntryPointTool . mainFileName) ) not found " )
215
215
}
216
216
217
217
let testObservabilitySetup : String
@@ -290,22 +290,22 @@ public struct BuildDescription: Codable {
290
290
public typealias CommandLineFlag = String
291
291
292
292
/// The Swift compiler invocation targets.
293
- let swiftCommands : [ BuildManifest . CmdName : SwiftCompilerTool ]
293
+ let swiftCommands : [ LLBuildManifest . CmdName : SwiftCompilerTool ]
294
294
295
295
/// The Swift compiler frontend invocation targets.
296
- let swiftFrontendCommands : [ BuildManifest . CmdName : SwiftFrontendTool ]
296
+ let swiftFrontendCommands : [ LLBuildManifest . CmdName : SwiftFrontendTool ]
297
297
298
298
/// The map of test discovery commands.
299
- let testDiscoveryCommands : [ BuildManifest . CmdName : LLBuildManifest . TestDiscoveryTool ]
299
+ let testDiscoveryCommands : [ LLBuildManifest . CmdName : TestDiscoveryTool ]
300
300
301
301
/// The map of test entry point commands.
302
- let testEntryPointCommands : [ BuildManifest . CmdName : LLBuildManifest . TestEntryPointTool ]
302
+ let testEntryPointCommands : [ LLBuildManifest . CmdName : TestEntryPointTool ]
303
303
304
304
/// The map of copy commands.
305
- let copyCommands : [ BuildManifest . CmdName : LLBuildManifest . CopyTool ]
305
+ let copyCommands : [ LLBuildManifest . CmdName : CopyTool ]
306
306
307
307
/// The map of write commands.
308
- let writeCommands : [ BuildManifest . CmdName : LLBuildManifest . WriteAuxiliaryFile ]
308
+ let writeCommands : [ LLBuildManifest . CmdName : WriteAuxiliaryFile ]
309
309
310
310
/// A flag that indicates this build should perform a check for whether targets only import
311
311
/// their explicitly-declared dependencies
@@ -328,12 +328,12 @@ public struct BuildDescription: Codable {
328
328
329
329
public init (
330
330
plan: BuildPlan ,
331
- swiftCommands: [ BuildManifest . CmdName : SwiftCompilerTool ] ,
332
- swiftFrontendCommands: [ BuildManifest . CmdName : SwiftFrontendTool ] ,
333
- testDiscoveryCommands: [ BuildManifest . CmdName : LLBuildManifest . TestDiscoveryTool ] ,
334
- testEntryPointCommands: [ BuildManifest . CmdName : LLBuildManifest . TestEntryPointTool ] ,
335
- copyCommands: [ BuildManifest . CmdName : LLBuildManifest . CopyTool ] ,
336
- writeCommands: [ BuildManifest . CmdName : LLBuildManifest . WriteAuxiliaryFile ] ,
331
+ swiftCommands: [ LLBuildManifest . CmdName : SwiftCompilerTool ] ,
332
+ swiftFrontendCommands: [ LLBuildManifest . CmdName : SwiftFrontendTool ] ,
333
+ testDiscoveryCommands: [ LLBuildManifest . CmdName : TestDiscoveryTool ] ,
334
+ testEntryPointCommands: [ LLBuildManifest . CmdName : TestEntryPointTool ] ,
335
+ copyCommands: [ LLBuildManifest . CmdName : CopyTool ] ,
336
+ writeCommands: [ LLBuildManifest . CmdName : WriteAuxiliaryFile ] ,
337
337
pluginDescriptions: [ PluginDescription ]
338
338
) throws {
339
339
self . swiftCommands = swiftCommands
0 commit comments