swiftwasm
diff --git a/‎Plugins/PackageToJS/Tests/ExampleTests.swift
Lines changed: 59 additions & 7 deletions b/‎Plugins/PackageToJS/Tests/ExampleTests.swift
Lines changed: 59 additions & 7 deletions
@@ -14,22 +14,36 @@ extension Trait where Self == ConditionTrait {
 
     static func requireSwiftSDK(triple: String) -> ConditionTrait {
         .enabled(
-            if: ProcessInfo.processInfo.environment["SWIFT_SDK_ID"] != nil
-                && ProcessInfo.processInfo.environment["SWIFT_PATH"] != nil
-                && ProcessInfo.processInfo.environment["SWIFT_SDK_ID"]!.hasSuffix(triple),
+            if: {
+                guard let swiftSDKID = ProcessInfo.processInfo.environment["SWIFT_SDK_ID"],
+                      ProcessInfo.processInfo.environment["SWIFT_PATH"] != nil else {
+                    return false
+                }
+                func sanityCheckCompatibility(triple: String) -> Bool {
+                    return swiftSDKID.hasSuffix(triple)
+                }
+                // For compatibility with old SDKs, we check wasm32-unknown-wasi as well when
+                // wasm32-unknown-wasip1 is requested.
+                if triple == "wasm32-unknown-wasip1" {
+                    if sanityCheckCompatibility(triple: "wasm32-unknown-wasi") {
+                        return true
+                    }
+                }
+                return sanityCheckCompatibility(triple: triple)
+            }(),
             "Requires SWIFT_SDK_ID and SWIFT_PATH environment variables"
         )
     }
 
-    static var requireEmbeddedSwift: ConditionTrait {
+    static func requireEmbeddedSwift(triple: String) -> ConditionTrait {
         // Check if $SWIFT_PATH/../lib/swift/embedded/wasm32-unknown-none-wasm/ exists
         return .enabled(
             if: {
                 guard let swiftPath = ProcessInfo.processInfo.environment["SWIFT_PATH"] else {
                     return false
                 }
                 let embeddedPath = URL(fileURLWithPath: swiftPath).deletingLastPathComponent()
-                    .appending(path: "lib/swift/embedded/wasm32-unknown-none-wasm")
+                    .appending(path: "lib/swift/embedded/\(triple)")
                 return FileManager.default.fileExists(atPath: embeddedPath.path)
             }(),
             "Requires embedded Swift SDK under $SWIFT_PATH/../lib/swift/embedded"
@@ -46,6 +60,28 @@ extension Trait where Self == ConditionTrait {
         ProcessInfo.processInfo.environment["SWIFT_PATH"]
     }
 
+    /// Check if the Swift SDK with the given ID is available.
+    static func isSwiftSDKAvailable(_ id: String) throws -> Bool {
+        let swiftExecutable = URL(
+            fileURLWithPath: "swift",
+            relativeTo: URL(fileURLWithPath: try #require(Self.getSwiftPath()))
+        )
+        let process = Process()
+        process.executableURL = swiftExecutable
+        let arguments = ["sdk", "configure", "--show-configuration", id]
+        process.arguments = arguments
+        process.standardOutput = FileHandle.nullDevice
+        process.standardError = FileHandle.nullDevice
+        do {
+            try process.run()
+            process.waitUntilExit()
+            return process.terminationStatus == 0
+        } catch {
+            try #require(Bool(false), "Failed to run swift \(arguments.joined(separator: " ")) with error: \(error)")
+            return false
+        }
+    }
+
     static let repoPath = URL(fileURLWithPath: #filePath)
         .deletingLastPathComponent()
         .deletingLastPathComponent()
@@ -220,7 +256,7 @@ extension Trait where Self == ConditionTrait {
         let swiftPath = try #require(Self.getSwiftPath())
         try withPackage(at: "Examples/Testing") { packageDir, runProcess, runSwift in
             try runSwift(
-                ["package", "--swift-sdk", swiftSDKID, "js", "test", "--enable-code-coverage"],
+                ["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--enable-code-coverage"],
                 [
                     "LLVM_PROFDATA_PATH": URL(fileURLWithPath: swiftPath).appending(path: "llvm-profdata").path
                 ]
@@ -267,7 +303,8 @@ extension Trait where Self == ConditionTrait {
         }
     }
 
-    @Test(.requireEmbeddedSwift) func embedded() throws {
+    @Test(.requireEmbeddedSwift(triple: "wasm32-unknown-none-wasm"))
+    func embeddedWasmUnknownNone() throws {
         try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
             try runSwift(
                 ["package", "--triple", "wasm32-unknown-none-wasm", "js", "-c", "release"],
@@ -278,6 +315,21 @@ extension Trait where Self == ConditionTrait {
         }
     }
 
+    @Test(.requireSwiftSDK(triple: "wasm32-unknown-wasip1"))
+    func embeddedWasmUnknownWasi() throws {
+        let baseSwiftSDKID = try #require(Self.getSwiftSDKID())
+        let swiftSDKID = "\(baseSwiftSDKID)-embedded"
+        try #require(try Self.isSwiftSDKAvailable(swiftSDKID), "Embedded Swift SDK with ID \(swiftSDKID) is not available")
+        try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
+            try runSwift(
+                ["package", "--swift-sdk", swiftSDKID, "js", "-c", "release"],
+                [
+                    "JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true"
+                ]
+            )
+        }
+    }
+
     @Test(.requireSwiftSDK)
     func continuationLeakInTest_XCTest() throws {
         let swiftSDKID = try #require(Self.getSwiftSDKID())