Duplicate e2e tests for Swift SDKs

.github/workflows/build-toolchain.yml

@@ -303,7 +303,13 @@ jobs:
         if: ${{ matrix.run_stdlib_test && matrix.container != null }}
         run: |
           docker exec swiftwasm-ci-buildbot /bin/bash -lc \
-            "./swiftwasm-build/schemes/${{ matrix.scheme }}/build/run-test.sh && rm -rf build"
+            "./swiftwasm-build/schemes/${{ matrix.scheme }}/build/run-test.sh"
+
+      # We need this step to save disk space for the next steps when building toolchain
+      - name: Cleanup build directory
+        if: ${{ matrix.run_stdlib_test && matrix.container != null && !matrix.only_swift_sdk }}
+        run: docker exec swiftwasm-ci-buildbot /bin/bash -lc "rm -rf build"
+
       - name: Run stdlib tests for wasi-wasm32
         if: ${{ matrix.run_stdlib_test && matrix.container == null }}
         run: ./swiftwasm-build/schemes/${{ matrix.scheme }}/build/run-test.sh
@@ -319,6 +325,15 @@ jobs:
           name: ${{ matrix.target }}-test-results
           path: ./swift-test-results.tar.gz
 
+      - name: Run integration tests (Swift SDK)
+        if: ${{ matrix.run_e2e_test && matrix.only_swift_sdk }}
+        run: |
+          docker exec swiftwasm-ci-buildbot /bin/bash -lc \
+            "./llvm-project/llvm/utils/lit/lit.py \
+              --param swift-sdk=wasm32-unknown-wasi \
+              --param swift-sdks-path=./swiftwasm-build/tools/swift-sdk-generator/Bundles \
+              --param scheme=${{ matrix.scheme }} ./swiftwasm-build/test -vv"
+
       - name: Cleanup docker volume
         if: ${{ matrix.container != null }}
         run: |

test/lit.cfg

@@ -23,6 +23,7 @@ config.test_exec_root = lit_config.params.get(
 config.available_features.add("platform="+platform.system())
 config.available_features.add("scheme="+lit_config.params.get("scheme", "main"))
 
+# --param package-path=PATH
 package_path = lit_config.params.get("package-path")
 if package_path:
     package_path = os.path.abspath(package_path)
@@ -31,6 +32,30 @@ else:
     lit_config.warning("'--param package-path=PATH' is not set, skipping toolchain tests")
 config.swift_package_path = package_path
 
+# --param swift-sdk=<swift-sdk-id>
+swift_sdk = lit_config.params.get("swift-sdk")
+if swift_sdk:
+    lit_config.note(f"testing Swift SDK: {swift_sdk}")
+else:
+    lit_config.warning("'--param swift-sdk=<swift-sdk-id>' is not set, skipping Swift SDK tests")
+config.swift_sdk = swift_sdk
+
+# --param swift-sdks-path=<swift-sdks-path>
+config.swift_sdks_path = lit_config.params.get("swift-sdks-path")
+if config.swift_sdks_path:
+    config.swift_sdks_path = os.path.abspath(config.swift_sdks_path)
+    lit_config.note(f"using Swift SDKs path: {config.swift_sdks_path}")
+
+# --param base-toolchain-path=PATH
+base_toolchain_path = lit_config.params.get("base-toolchain-path")
+if base_toolchain_path:
+    base_toolchain_path = os.path.abspath(base_toolchain_path)
+    lit_config.note(f"using base toolchain: {base_toolchain_path}")
+else:
+    base_toolchain_path = os.path.abspath(os.path.join(workspace_root, "build", "Packaging", "base-snapshot"))
+    lit_config.note(f"using default base toolchain: {base_toolchain_path}")
+config.base_toolchain_path = base_toolchain_path
+
 def llvm_tool_path(tool):
     candidates = []
     llvm_bin = lit_config.params.get("llvm-bin")

test/swift-sdk/Inputs/clang-module-example/Package.swift

@@ -0,0 +1,11 @@
+// swift-tools-version: 5.8
+
+import PackageDescription
+
+let package = Package(
+    name: "ClangModuleExample",
+    targets: [
+        .executableTarget(name: "Main", dependencies: ["_CModule"]),
+        .target(name: "_CModule"),
+    ]
+)

test/swift-sdk/Inputs/clang-module-example/Sources/Main/ClangModuleExample.swift

@@ -0,0 +1 @@
+import _CModule

test/swift-sdk/Inputs/clang-module-example/Sources/_CModule/_CModule.c

@@ -0,0 +1 @@
+#include "_CModule.h"

test/swift-sdk/Inputs/clang-module-example/Sources/_CModule/include/_CModule.h

@@ -0,0 +1,4 @@
+#include <stddef.h> // Clang header should be found
+#if __wasi__
+# include <wasi/api.h> // wasi-libc header
+#endif

test/swift-sdk/Inputs/clang-module-example/Sources/_CModule/include/module.modulemap

@@ -0,0 +1,3 @@
+module _CModule {
+  header "_CModule.h"
+}

test/swift-sdk/Inputs/imports.swift

@@ -0,0 +1,17 @@
+import Foundation
+import XCTest
+import WASILibc
+
+#if canImport(FoundationXML)
+  import FoundationXML
+#endif
+// FIXME: This should be supported on swiftwasm branch
+// #if canImport(FoundationNetworking)
+//   #error("FoundationNetworking should not be able to import now")
+// #endif
+
+public func main() {
+  _ = Date()
+  _ = UUID()
+  _ = URL(string: "https://example.com")!
+}

test/swift-sdk/clang-module.swift

@@ -0,0 +1,6 @@
+// RUN: rm -rf %t.dir
+// RUN: mkdir -p %t.dir
+// RUN: %{swift} build --package-path %S/Inputs/clang-module-example --scratch-path %t.dir --triple wasm32-unknown-wasi --static-swift-stdlib
+
+// Skipping this test on main until we include swift-testing in the SDK
+// REQUIRES: GH-5587

test/swift-sdk/foundation/Bundle.swift

@@ -0,0 +1,13 @@
+// RUN: %{target_simple_swift_build}
+// RUN: %{wasm_run} --dir %t.dir::/tmp --dir %t.dir::/tmp2 %t.dir/.build/debug/Check.wasm | %{FileCheck} %s
+// REQUIRES: FileCheck && scheme=main
+
+import Foundation
+
+// Bundle.main is derived from the path of the executable and cwd
+// CHECK: bundlePath: /tmp
+chdir("/tmp")
+print("bundlePath:", Bundle.main.bundlePath)
+
+// CHECK: Bundle(path:).bundlePath: /tmp2
+print("Bundle(path:).bundlePath:", Bundle(path: "/tmp2")?.bundlePath ?? "nil")

test/swift-sdk/foundation/FileManager.swift

@@ -0,0 +1,34 @@
+// RUN: %{target_simple_swift_build}
+// RUN: rm -rf %t.mnt
+// RUN: mkdir -p %t.mnt
+// RUN: %{wasm_run} --dir %t.mnt::/tmp --dir %S/Inputs::/Inputs %t.dir/.build/debug/Check.wasm | %{FileCheck} %s
+// REQUIRES: FileCheck && scheme=main
+
+import Foundation
+
+// CHECK: cwd: /
+print("cwd: \(FileManager.default.currentDirectoryPath)")
+// CHECK: chdir: true
+let chdirResult = FileManager.default.changeCurrentDirectoryPath("/tmp")
+print("chdir: \(chdirResult)")
+// CHECK: cwd: /tmp
+print("cwd: \(FileManager.default.currentDirectoryPath)")
+
+// CHECK: homeDirectory: file:///var/empty/
+print("homeDirectory: \(FileManager.default.homeDirectory(forUser: "nobody")?.absoluteString ?? "nil")")
+
+// CHECK: temporaryDirectory: file:///tmp/
+print("temporaryDirectory: \(FileManager.default.temporaryDirectory)")
+
+// CHECK: contentsOfDirectory(/Inputs): ["check.dir", "empty.txt", "hello.txt"]
+print("contentsOfDirectory(/Inputs): \(try! FileManager.default.contentsOfDirectory(atPath: "/Inputs").sorted())")
+// CHECK: contentsOfDirectory(/Inputs/check.dir): ["check0.txt", "check1.txt"]
+print("contentsOfDirectory(/Inputs/check.dir): \(try! FileManager.default.contentsOfDirectory(atPath: "/Inputs/check.dir").sorted())")
+
+// CHECK: Data(contentsOf: /Inputs/hello.txt): 6 bytes
+print("Data(contentsOf: /Inputs/hello.txt): \(try! Data(contentsOf: URL(fileURLWithPath: "/Inputs/hello.txt")))")
+// CHECK: String(contentsOf: /Inputs/hello.txt): world
+print("String(contentsOf: /Inputs/hello.txt): \(try! String(contentsOf: URL(fileURLWithPath: "/Inputs/hello.txt")))")
+
+// CHECK: mountedVolumeURLs: ["/Inputs", "/tmp"]
+print("mountedVolumeURLs: \(FileManager.default.mountedVolumeURLs(includingResourceValuesForKeys:[], options: [])?.map { $0.path }.sorted() ?? [])")

test/swift-sdk/foundation/Inputs/hello.txt

@@ -0,0 +1 @@
+world

test/swift-sdk/foundation/ProcessInfo.swift

@@ -0,0 +1,11 @@
+// RUN: %{target_simple_swift_build}
+// RUN: %{wasm_run} --dir %t.dir::/tmp %t.dir/.build/debug/Check.wasm | %{FileCheck} %s
+// REQUIRES: FileCheck && scheme=main
+
+import Foundation
+
+// CHECK: processName: Check.wasm
+print("processName: " + ProcessInfo.processInfo.processName)
+
+// CHECK: hostname: localhost
+print("hostname: " + ProcessInfo.processInfo.hostName)

test/swift-sdk/foundation/XML.swift

@@ -0,0 +1,21 @@
+// RUN: %{target_simple_swift_build}
+// RUN: %{wasm_run} %t.dir/.build/debug/Check.wasm | %{FileCheck} %s
+// REQUIRES: FileCheck
+
+import FoundationXML
+
+let xml = """
+<note>
+  <to>Tove</to>
+  <from>Jani</from>
+  <heading>Reminder</heading>
+  <body>Don't forget me this weekend!</body>
+</note>
+"""
+
+let xmlData = xml.data(using: .utf8)!
+let document = try XMLDocument(data: xmlData)
+
+let to = try document.nodes(forXPath: "/note/to").first?.stringValue
+// CHECK: to: Tove
+print("to: \(to!)")

test/swift-sdk/lit.local.cfg

@@ -0,0 +1,25 @@
+import os
+
+if not config.root.swift_sdk:
+    config.unsupported = True
+else:
+    bin_path = os.path.join(config.root.base_toolchain_path, "usr", "bin")
+
+    swift = os.path.join(bin_path, "swift")
+    config.substitutions.append(("%{swift}", swift))
+
+    swift_sdk_options = f"--swift-sdk {config.root.swift_sdk}"
+    if config.root.swift_sdks_path:
+        swift_sdk_options += f" --swift-sdks-path {config.root.swift_sdks_path}"
+    config.substitutions.append(("%{swift_sdk_options}", swift_sdk_options))
+    target_swift_build = f"{swift} build {swift_sdk_options}"
+    config.substitutions.append(("%{target_swift_build}", target_swift_build))
+
+    simple_swift_build_steps = [
+        'rm -rf %t.dir',
+        'mkdir -p %t.dir',
+        f'{swift} package init --package-path %t.dir --name Check --type executable',
+        'cp %s %t.dir/Sources/main.swift',
+        f'{target_swift_build} --package-path %t.dir',
+    ]
+    config.substitutions.append(("%{target_simple_swift_build}", " && ".join(simple_swift_build_steps)))

test/swift-sdk/swiftpm-build.swift

@@ -0,0 +1,5 @@
+// RUN: rm -rf %t.dir
+// RUN: mkdir -p %t.dir
+// RUN: %{swift} package init --package-path %t.dir --name Example
+// RUN: cp %S/Inputs/imports.swift %t.dir/Sources/Example/Imports.swift
+// RUN: %{target_swift_build} --package-path %t.dir

test/swift-sdk/swiftpm-test.test

@@ -0,0 +1,12 @@
+REQUIRES: FileCheck
+# Skipping this test on main until we include swift-testing in the SDK
+REQUIRES: GH-5587
+
+RUN: rm -rf %t.dir
+RUN: mkdir -p %t.dir
+RUN: %{swift} package init --package-path %t.dir --name Example
+RUN: %{target_swift_build} --package-path %t.dir --build-tests
+RUN: %{wasm_run} --dir . %t.dir/.build/debug/ExamplePackageTests.wasm | %{FileCheck} %s
+
+CHECK: Test Suite 'All tests' passed at
+CHECK:          Executed 1 test, with 0 failures (0 unexpected) in

test/toolchain/lit.local.cfg

@@ -2,10 +2,10 @@ import os
 
 if not config.root.swift_package_path:
     config.unsupported = True
+else:
+    bin_path = os.path.join(config.root.swift_package_path, "usr", "bin")
 
-bin_path = os.path.join(config.root.swift_package_path, "usr", "bin")
+    for tool in ["swift", "swiftc"]:
+        config.substitutions.append(("%{" + tool + "}", os.path.join(bin_path, tool)))
 
-for tool in ["swift", "swiftc"]:
-    config.substitutions.append(("%{" + tool + "}", os.path.join(bin_path, tool)))
-
-config.substitutions.append(("%{package_path}", config.root.swift_package_path))
+    config.substitutions.append(("%{package_path}", config.root.swift_package_path))