Skip to content

Commit 02aee6e

Browse files
committed
Fix failing tests
1 parent 12b2632 commit 02aee6e

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

Sources/SwiftSDKGenerator/SwiftSDKRecipes/SwiftSDKRecipe.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,16 @@ package protocol SwiftSDKRecipe: Sendable {
5353
}
5454

5555
extension SwiftSDKRecipe {
56-
package func applyPlatformOptions(toolset: inout Toolset, targetTriple: Triple) {}
56+
package func applyPlatformOptions(
57+
toolset: inout Toolset,
58+
targetTriple: Triple,
59+
isForEmbeddedSwift: Bool
60+
) {}
5761
package func applyPlatformOptions(
5862
metadata: inout SwiftSDKMetadataV4.TripleProperties,
5963
paths: PathsConfiguration,
60-
targetTriple: Triple
64+
targetTriple: Triple,
65+
isForEmbeddedSwift: Bool
6166
) {}
6267

6368
package var shouldSupportEmbeddedSwift: Bool { false }

Sources/SwiftSDKGenerator/SwiftSDKRecipes/WebAssemblyRecipe.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ package struct WebAssemblyRecipe: SwiftSDKRecipe {
126126

127127
var finalTriple = targetTriple
128128
if isForEmbeddedSwift {
129+
metadata.targetTriples.removeValue(forKey: targetTriple.triple)
129130
finalTriple = Triple("wasm32-unknown-wasip1")
130131
}
131132

Tests/SwiftSDKGeneratorTests/SwiftSDKRecipes/LinuxRecipeTests.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ final class LinuxRecipeTests: XCTestCase {
8585
var toolset = Toolset(rootPath: nil)
8686
recipe.applyPlatformOptions(
8787
toolset: &toolset,
88-
targetTriple: testCase.targetTriple
88+
targetTriple: testCase.targetTriple,
89+
isForEmbeddedSwift: false
8990
)
9091
XCTAssertEqual(toolset.swiftCompiler?.extraCLIOptions, testCase.expectedSwiftCompilerOptions)
9192
XCTAssertEqual(toolset.linker?.path, testCase.expectedLinkerPath)
@@ -103,7 +104,8 @@ final class LinuxRecipeTests: XCTestCase {
103104
var toolset = Toolset(rootPath: "swift.xctoolchain")
104105
recipe.applyPlatformOptions(
105106
toolset: &toolset,
106-
targetTriple: Triple("x86_64-unknown-linux-gnu")
107+
targetTriple: Triple("x86_64-unknown-linux-gnu"),
108+
isForEmbeddedSwift: false
107109
)
108110
XCTAssertEqual(toolset.rootPath, nil)
109111
XCTAssertEqual(

Tests/SwiftSDKGeneratorTests/SwiftSDKRecipes/WebAssemblyRecipe.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ final class WebAssemblyRecipeTests: XCTestCase {
3333
var toolset = Toolset(rootPath: nil)
3434
recipe.applyPlatformOptions(
3535
toolset: &toolset,
36-
targetTriple: Triple("wasm32-unknown-wasi")
36+
targetTriple: Triple("wasm32-unknown-wasi"),
37+
isForEmbeddedSwift: false
3738
)
3839
XCTAssertEqual(toolset.swiftCompiler?.extraCLIOptions, ["-static-stdlib"])
3940
XCTAssertNil(toolset.cCompiler)
@@ -46,7 +47,8 @@ final class WebAssemblyRecipeTests: XCTestCase {
4647
var toolset = Toolset(rootPath: nil)
4748
recipe.applyPlatformOptions(
4849
toolset: &toolset,
49-
targetTriple: Triple("wasm32-unknown-wasip1-threads")
50+
targetTriple: Triple("wasm32-unknown-wasip1-threads"),
51+
isForEmbeddedSwift: false
5052
)
5153
XCTAssertEqual(
5254
toolset.swiftCompiler?.extraCLIOptions,

0 commit comments

Comments
 (0)