Fix e2e test driver to use new base-toolchain path

Author: kateinoigakukun

.github/workflows/build-toolchain.yml

@@ -265,10 +265,7 @@ jobs:
         if: ${{ matrix.run_e2e_test }}
         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=./swift-sdk-generator/Bundles \
-              --param scheme=${{ matrix.scheme }} ./swiftwasm-build/test -vv"
+            "./swiftwasm-build/tools/build/run-e2e-test --scheme ${{ matrix.scheme }}"
 
       - name: Cleanup docker volume
         if: ${{ matrix.container != null }}

tools/build/run-e2e-test

@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+
+import sys
+import argparse
+import pathlib
+import subprocess
+import os
+from build_support.actions import derive_options_from_args, REPO_ROOT, DownloadBaseSnapshotAction
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Run e2e integration tests for Swift SDK')
+    parser.add_argument('--swift-sdk', default='wasm32-unknown-wasi',
+                        help='Swift SDK identifier (default: wasm32-unknown-wasi)')
+    parser.add_argument('args', nargs=argparse.REMAINDER,
+                        help='Extra arguments to pass to lit.py')
+    options = derive_options_from_args(sys.argv[1:], parser)
+
+    extra_lit_args = options.args
+    if len(extra_lit_args) > 0 and extra_lit_args[0] == "--":
+        extra_lit_args = extra_lit_args[1:]
+
+    repo_path = pathlib.Path(REPO_ROOT)
+    base_toolchain_path = DownloadBaseSnapshotAction.toolchain_path(options)
+    lit_py_path = repo_path.parent / "llvm-project" / "llvm" / "utils" / "lit" / "lit.py"
+    swift_sdks_path = repo_path.parent / "swift-sdk-generator" / "Bundles"
+
+    # Build lit command
+    lit_cmd = [
+        str(lit_py_path),
+        "--param", f"swift-sdk={options.swift_sdk}",
+        "--param", f"scheme={options.scheme}",
+        "--param", f"base-toolchain-path={base_toolchain_path}",
+        "--param", f"swift-sdks-path={swift_sdks_path}",
+    ]
+    test_dir = repo_path / "test"
+    lit_cmd.append(str(test_dir))
+    lit_cmd.extend(extra_lit_args)
+
+    print("=====> Running e2e integration tests")
+    print(f"Command: {' '.join(lit_cmd)}")
+
+    # Run the tests
+    try:
+        subprocess.check_call(lit_cmd)
+        print("=====> e2e tests completed successfully")
+    except subprocess.CalledProcessError as e:
+        print(f"=====> e2e tests failed with exit code {e.returncode}")
+        sys.exit(e.returncode)
+
+
+if __name__ == '__main__':
+    main()