Skip to content

Commit ac91508

Browse files
committed
Fix CommandLineSpecTests
I broke these in #31 since that added a new setting that needs to be manually applied in this particular test.
1 parent c9c7265 commit ac91508

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Tests/SWBCoreTests/CommandLineSpecTests.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ import SWBMacro
163163
}
164164
}
165165

166-
@Test(.requireHostOS(.macOS), .requireXcode16())
166+
@Test(.requireHostOS(.macOS))
167167
func swiftTaskConstruction() async throws {
168168
let core = try await getCore()
169169
let swiftSpec = try core.specRegistry.getSpec() as SwiftCompilerSpec
@@ -190,6 +190,7 @@ import SWBMacro
190190
table.push(BuiltinMacros.SWIFT_TARGET_TRIPLE, core.specRegistry.internalMacroNamespace.parseString("$(CURRENT_ARCH)-apple-$(SWIFT_PLATFORM_TARGET_PREFIX)$(SWIFT_DEPLOYMENT_TARGET)$(LLVM_TARGET_TRIPLE_SUFFIX)"))
191191
table.push(BuiltinMacros.OBJECT_FILE_DIR, literal: Path.root.join("tmp/output/obj").str)
192192
table.push(BuiltinMacros.PER_ARCH_OBJECT_FILE_DIR, BuiltinMacros.namespace.parseString(Path.root.join("tmp/output/obj-normal/x86_64").str))
193+
table.push(BuiltinMacros.PER_ARCH_MODULE_FILE_DIR, BuiltinMacros.namespace.parseString(Path.root.join("tmp/output/obj-normal/x86_64").str))
193194
table.push(BuiltinMacros.ENABLE_DEFAULT_SEARCH_PATHS, literal: true)
194195
table.push(BuiltinMacros.BUILT_PRODUCTS_DIR, literal: Path.root.join("tmp/output/sym").str)
195196
let builtProductsDirList = core.specRegistry.internalMacroNamespace.parseStringList("$(BUILT_PRODUCTS_DIR)")
@@ -319,7 +320,7 @@ import SWBMacro
319320
}
320321
}
321322

322-
@Test(.requireHostOS(.macOS), .requireLLBuild(apiVersion: 12), .requireXcode16())
323+
@Test(.requireHostOS(.macOS), .requireLLBuild(apiVersion: 12))
323324
func swiftTaskConstruction_integratedDriver() async throws {
324325
let core = try await getCore()
325326
let swiftSpec = try core.specRegistry.getSpec() as SwiftCompilerSpec
@@ -347,6 +348,7 @@ import SWBMacro
347348
table.push(BuiltinMacros.SWIFT_TARGET_TRIPLE, core.specRegistry.internalMacroNamespace.parseString("$(CURRENT_ARCH)-apple-$(SWIFT_PLATFORM_TARGET_PREFIX)$(SWIFT_DEPLOYMENT_TARGET)$(LLVM_TARGET_TRIPLE_SUFFIX)"))
348349
table.push(BuiltinMacros.OBJECT_FILE_DIR, literal: "/tmp/output/obj")
349350
table.push(BuiltinMacros.PER_ARCH_OBJECT_FILE_DIR, BuiltinMacros.namespace.parseString("/tmp/output/obj-normal/x86_64"))
351+
table.push(BuiltinMacros.PER_ARCH_MODULE_FILE_DIR, BuiltinMacros.namespace.parseString("/tmp/output/obj-normal/x86_64"))
350352
table.push(BuiltinMacros.ENABLE_DEFAULT_SEARCH_PATHS, literal: true)
351353
table.push(BuiltinMacros.BUILT_PRODUCTS_DIR, literal: "/tmp/output/sym")
352354
let builtProductsDirList = core.specRegistry.internalMacroNamespace.parseStringList("$(BUILT_PRODUCTS_DIR)")
@@ -502,7 +504,7 @@ import SWBMacro
502504
}
503505

504506
// remove in rdar://53000820
505-
@Test(.requireSDKs(.macOS), .requireXcode16())
507+
@Test(.requireSDKs(.macOS))
506508
func swiftTaskConstructionWithoutResponseFile() async throws {
507509
let core = try await getCore()
508510
let swiftSpec = try core.specRegistry.getSpec() as SwiftCompilerSpec
@@ -529,6 +531,7 @@ import SWBMacro
529531
table.push(BuiltinMacros.SWIFT_TARGET_TRIPLE, core.specRegistry.internalMacroNamespace.parseString("$(CURRENT_ARCH)-apple-$(SWIFT_PLATFORM_TARGET_PREFIX)$(SWIFT_DEPLOYMENT_TARGET)$(LLVM_TARGET_TRIPLE_SUFFIX)"))
530532
table.push(BuiltinMacros.OBJECT_FILE_DIR, literal: "/tmp/output/obj")
531533
table.push(BuiltinMacros.PER_ARCH_OBJECT_FILE_DIR, BuiltinMacros.namespace.parseString("/tmp/output/obj-normal/x86_64"))
534+
table.push(BuiltinMacros.PER_ARCH_MODULE_FILE_DIR, BuiltinMacros.namespace.parseString("/tmp/output/obj-normal/x86_64"))
532535
table.push(BuiltinMacros.ENABLE_DEFAULT_SEARCH_PATHS, literal: true)
533536
table.push(BuiltinMacros.BUILT_PRODUCTS_DIR, literal: "/tmp/output/sym")
534537
let builtProductsDirList = core.specRegistry.internalMacroNamespace.parseStringList("$(BUILT_PRODUCTS_DIR)")

0 commit comments

Comments
 (0)