Improve the WebAssembly tests

Make them work on Linux, and standardize how they're skipped if SDKs are not installed.

rdar://148676808

Author: jakepetroules

Sources/SWBCore/SwiftSDK.swift

@@ -69,20 +69,24 @@ public struct SwiftSDK: Sendable {
     }
 
     /// The default location storing Swift SDKs installed by SwiftPM.
-    static var defaultSwiftSDKsDirectory: Path {
-        get throws {
-            try FileManager.default.url(
+    static func defaultSwiftSDKsDirectory(hostOperatingSystem: OperatingSystem) throws -> Path {
+        let spmURL: URL
+        if hostOperatingSystem == .macOS {
+            spmURL = try FileManager.default.url(
                 for: .libraryDirectory,
                 in: .userDomainMask,
                 appropriateFor: nil,
                 create: false
-            ).appendingPathComponent("org.swift.swiftpm").appendingPathComponent("swift-sdks").filePath
+            ).appendingPathComponent("org.swift.swiftpm")
+        } else {
+            spmURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".swiftpm")
         }
+        return try spmURL.appendingPathComponent("swift-sdks").filePath
     }
 
     /// Find Swift SDKs installed by SwiftPM.
-    public static func findSDKs(targetTriples: [String], fs: any FSProxy) throws -> [SwiftSDK] {
-        return try findSDKs(swiftSDKsDirectory: defaultSwiftSDKsDirectory, targetTriples: targetTriples, fs: fs)
+    public static func findSDKs(targetTriples: [String], fs: any FSProxy, hostOperatingSystem: OperatingSystem) throws -> [SwiftSDK] {
+        return try findSDKs(swiftSDKsDirectory: defaultSwiftSDKsDirectory(hostOperatingSystem: hostOperatingSystem), targetTriples: targetTriples, fs: fs)
     }
 
     private static func findSDKs(swiftSDKsDirectory: Path, targetTriples: [String], fs: any FSProxy) throws -> [SwiftSDK] {

Sources/SWBTestSupport/SkippedTestSupport.swift

@@ -115,7 +115,9 @@ extension Trait where Self == Testing.ConditionTrait {
     package static func requireSDKs(_ knownSDKs: KnownSDK..., comment: Comment? = nil) -> Self {
         enabled(comment != nil ? "required SDKs are not installed: \(comment?.description ?? "")" : "required SDKs are not installed.", {
             let sdkRegistry = try await ConditionTraitContext.shared.getCore().sdkRegistry
-            let missingSDKs = await knownSDKs.asyncFilter { sdkRegistry.lookup($0.sdkName) == nil }.sorted()
+            let missingSDKs = await knownSDKs.asyncFilter { knownSDK in
+                sdkRegistry.lookup(knownSDK.sdkName) == nil && sdkRegistry.allSDKs.count(where: { $0.aliases.contains(knownSDK.sdkName) }) == 0
+            }.sorted()
             return missingSDKs.isEmpty
         })
     }
@@ -136,6 +138,13 @@ extension Trait where Self == Testing.ConditionTrait {
         disabled("Process spawning is unavailable.", { try ProcessInfo.processInfo.hostOperatingSystem().isAppleEmbedded || ProcessInfo.processInfo.isMacCatalystApp })
     }
 
+    /// Constructs a condition trait that causes a test to be disabled if the developer directory is pointing at an Xcode developer directory.
+    package static var skipXcodeToolchain: Self {
+        disabled("This test is incompatible with Xcode toolchains.", {
+            try await ConditionTraitContext.shared.getCore().developerPath.path.str.contains(".app/Contents/Developer")
+        })
+    }
+
     /// Constructs a condition trait that causes a test to be disabled if the Foundation process spawning implementation is not using `posix_spawn_file_actions_addchdir`.
     package static var requireThreadSafeWorkingDirectory: Self {
         disabled("Thread-safe process working directory support is unavailable.", {

Sources/SWBWebAssemblyPlatform/Plugin.swift

@@ -25,6 +25,10 @@ struct WebAssemblyPlatformSpecsExtension: SpecificationsExtension {
     func specificationFiles(resourceSearchPaths: [Path]) -> Bundle? {
         findResourceBundle(nameWhenInstalledInToolchain: "SwiftBuild_SWBWebAssemblyPlatform", resourceSearchPaths: resourceSearchPaths, defaultBundle: Bundle.module)
     }
+
+    func specificationDomains() -> [String: [String]] {
+        ["webassembly": ["generic-unix"]]
+    }
 }
 
 struct WebAssemblyPlatformExtension: PlatformInfoExtension {
@@ -76,7 +80,8 @@ struct WebAssemblySDKRegistryExtension: SDKRegistryExtension {
 
         let wasmSwiftSDKs = (try? SwiftSDK.findSDKs(
             targetTriples: Array(supportedTriples.keys),
-            fs: context.fs
+            fs: context.fs,
+            hostOperatingSystem: context.hostOperatingSystem
         )) ?? []
 
         var wasmSDKs: [(path: Path, platform: SWBCore.Platform?, data: [String: PropertyListItem])] = []
@@ -94,6 +99,7 @@ struct WebAssemblySDKRegistryExtension: SDKRegistryExtension {
                     "Type": .plString("SDK"),
                     "Version": .plString("1.0.0"),
                     "CanonicalName": .plString(wasmSDK.identifier),
+                    "Aliases": ["webassembly", "wasi"],
                     "IsBaseSDK": .plBool(true),
                     "DefaultProperties": .plDict([
                         "PLATFORM_NAME": .plString("webassembly"),

Sources/SWBWebAssemblyPlatform/Specs/WasmLd.xcspec

@@ -15,7 +15,7 @@
         Domain = webassembly;
         Identifier = "com.apple.pbx.linkers.ld";
         Type = Linker;
-        BasedOn = "default:com.apple.pbx.linkers.ld";
+        BasedOn = "generic-unix:com.apple.pbx.linkers.ld";
         Name = Ld;
         Description = "Link executable using alternate linker";
         IsAbstract = Yes;
@@ -39,12 +39,6 @@
                     },
                 );
             },
-            {
-                Name = SDKROOT;
-                Type = Path;
-                CommandLineFlag = "--sysroot";
-                IsInputDependency = Yes;
-            },
             {
                 // wasm-ld is always deterministic
                 Name = LD_DETERMINISTIC_MODE;
@@ -138,6 +132,16 @@
                 };
                 Condition = "$(MACH_O_TYPE) == mh_dylib";
             },
+            {
+                Name = "CLANG__INPUT_FILE_LIST_PATH__";
+                Type = Path;
+                Condition = "NO"; // wasm-ld does not support -filelist
+            },
+            {
+                Name = "SWIFTC__INPUT_FILE_LIST_PATH__";
+                Type = Path;
+                Condition = "NO"; // wasm-ld does not support -filelist
+            },
         );
     },
 )

Tests/SWBWebAssemblyPlatformTests/SWBWebAssemblyPlatformTests.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Testing
+import SWBCore
 import SWBProtocol
 import SWBTestSupport
 import SWBTaskExecution
@@ -19,13 +20,13 @@ import SWBUtil
 @Suite
 fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
     @Test(
+        .requireSDKs(.wasi),
         .requireThreadSafeWorkingDirectory,
-        .enabled(if: getEnvironmentVariable("WASM_SDKROOT") != nil),
+        .skipXcodeToolchain,
         arguments: ["wasm32"], [true, false]
     )
     func wasiCommandWithSwift(arch: String, enableTestability: Bool) async throws {
-        guard let sdkroot = getEnvironmentVariable("WASM_SDKROOT") else { return }
-        guard let toolchain = getEnvironmentVariable("WASM_TOOLCHAINS") else { return }
+        let sdkroot = try await #require(getCore().loadSDK(llvmTargetTripleSys: "wasi")).path.str
 
         try await withTemporaryDirectory { (tmpDir: Path) in
             let testProject = TestProject(
@@ -46,7 +47,6 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
                         "SDKROOT": sdkroot,
                         "SWIFT_VERSION": "6.0",
                         "SUPPORTED_PLATFORMS": "webassembly",
-                        "TOOLCHAINS": toolchain,
                         "ENABLE_TESTABILITY": enableTestability ? "YES" : "NO"
                     ])
                 ],
@@ -132,10 +132,9 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
         }
     }
 
-    @Test(.requireThreadSafeWorkingDirectory, .enabled(if: getEnvironmentVariable("WASM_SDKROOT") != nil), arguments: ["wasm32"])
+    @Test(.requireSDKs(.wasi), .requireThreadSafeWorkingDirectory, .skipXcodeToolchain, arguments: ["wasm32"])
     func wasiCommandWithCAndCxx(arch: String) async throws {
-        guard let sdkroot = getEnvironmentVariable("WASM_SDKROOT") else { return }
-        guard let toolchain = getEnvironmentVariable("WASM_TOOLCHAINS") else { return }
+        let sdkroot = try await #require(getCore().loadSDK(llvmTargetTripleSys: "wasi")).path.str
 
         try await withTemporaryDirectory { (tmpDir: Path) in
             let testProject = TestProject(
@@ -157,7 +156,6 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
                         "SDKROOT": sdkroot,
                         "SWIFT_VERSION": "6.0",
                         "SUPPORTED_PLATFORMS": "webassembly",
-                        "TOOLCHAINS": toolchain,
                     ])
                 ],
                 targets: [
@@ -252,3 +250,9 @@ fileprivate struct SWBWebAssemblyPlatformTests: CoreBasedTests {
         }
     }
 }
+
+fileprivate extension Core {
+    func loadSDK(llvmTargetTripleSys: String) -> SDK? {
+        sdkRegistry.allSDKs.filter { $0.defaultVariant?.llvmTargetTripleSys == llvmTargetTripleSys }.only
+    }
+}