deps: update wasi-testsuite to latest prod/testsuite-all

Author: TerrorJack

test/adapters/browser/run-wasi.mjs

@@ -6,17 +6,28 @@ import { chromium } from "playwright"
 import { parseArgs } from "../shared/parseArgs.mjs"
 import { walkFs } from "../shared/walkFs.mjs"
 
+function parseDirSpec(dirSpec) {
+  const separator = dirSpec.indexOf("::");
+  if (separator === -1) {
+    return { host: dirSpec, guest: dirSpec };
+  }
+  const host = dirSpec.slice(0, separator);
+  const guest = dirSpec.slice(separator + 2) || ".";
+  return { host, guest };
+}
+
 async function derivePreopens(dirs) {
   const preopens = [];
-  for (let dir of dirs) {
-    const contents = await walkFs(dir, (name, entry, out) => {
+  for (const dirSpec of dirs) {
+    const { host, guest } = parseDirSpec(dirSpec);
+    const contents = await walkFs(host, (name, entry, out) => {
       if (entry.kind === "file") {
         // Convert buffer to array to make it serializable.
         entry.buffer = Array.from(entry.buffer);
       }
       return { ...out, [name]: entry };
     }, () => {});
-    preopens.push({ dir, contents });
+    preopens.push({ dir: guest, contents });
   }
   return preopens;
 }
@@ -58,7 +69,12 @@ async function configureRoutes(context, harnessURL) {
     const content = await fs.readFile(path.join(projectDir, relativePath));
     route.fulfill({
       status: 200,
-      contentType: 'application/javascript',
+      contentType:
+        {
+          ".wasm": "application/wasm",
+          ".json": "application/json",
+          ".js": "application/javascript",
+        }[path.extname(pathname)] || "application/octet-stream",
       body: content,
     });
   });

test/adapters/node/run-wasi.mjs

@@ -33,10 +33,21 @@ class NodeStdout extends Fd {
   }
 }
 
+function parseDirSpec(dirSpec) {
+  const separator = dirSpec.indexOf("::");
+  if (separator === -1) {
+    return { host: dirSpec, guest: dirSpec };
+  }
+  const host = dirSpec.slice(0, separator);
+  const guest = dirSpec.slice(separator + 2) || ".";
+  return { host, guest };
+}
+
 async function derivePreopens(dirs) {
   const preopens = [];
-  for (let dir of dirs) {
-    const contents = await walkFs(dir, (name, entry, out) => {
+  for (const dirSpec of dirs) {
+    const { host, guest } = parseDirSpec(dirSpec);
+    const contents = await walkFs(host, (name, entry, out) => {
       switch (entry.kind) {
         case "dir":
           entry = new Directory(entry.contents);
@@ -50,7 +61,7 @@ async function derivePreopens(dirs) {
       out.set(name, entry);
       return out;
     }, () => new Map())
-    const preopen = new PreopenDirectory(dir, contents);
+    const preopen = new PreopenDirectory(guest, contents);
     preopens.push(preopen);
   }
   return preopens;

test/adapters/shared/adapter.py

@@ -1,13 +1,60 @@
-import subprocess
-import pathlib
-import sys
+import json
 import os
+import shlex
+from functools import lru_cache
+from pathlib import Path
+from typing import Dict, List, Tuple
 
-run_wasi_mjs = pathlib.Path(__file__).parent / "run-wasi.mjs"
-args = sys.argv[1:]
-cmd = ["node", str(run_wasi_mjs)] + args
-if os.environ.get("VERBOSE_ADAPTER") is not None:
-    print(" ".join(map(lambda x: f"'{x}'", cmd)))
+def _adapter_dir() -> Path:
+    spec = globals().get("__spec__")
+    if spec is not None and getattr(spec, "origin", None):
+        return Path(spec.origin).parent
+    return Path(__file__).parent
 
-result = subprocess.run(cmd, check=False)
-sys.exit(result.returncode)
+
+_ADAPTER_DIR = _adapter_dir()
+
+
+@lru_cache(maxsize=1)
+def _package_metadata() -> Dict[str, str]:
+    with (_ADAPTER_DIR.parents[2] / "package.json").open(encoding="utf-8") as pkg_file:
+        return json.load(pkg_file)
+
+
+def get_name() -> str:
+    return f"{_package_metadata()['name']} ({_ADAPTER_DIR.name})"
+
+
+def get_version() -> str:
+    return _package_metadata()["version"]
+
+
+def get_wasi_versions() -> List[str]:
+    return ["wasm32-wasip1"]
+
+
+def compute_argv(test_path: str,
+                 args: List[str],
+                 env: Dict[str, str],
+                 dirs: List[Tuple[Path, str]],
+                 wasi_version: str) -> List[str]:
+    if wasi_version != "wasm32-wasip1":
+        raise RuntimeError(f"unsupported WASI version: {wasi_version}")
+
+    node_cmd = shlex.split(os.environ.get("NODE", "node"))
+    run_wasi = _ADAPTER_DIR / "run-wasi.mjs"
+    argv = node_cmd + [str(run_wasi), f"--test-file={test_path}"]
+
+    for arg in args:
+        argv.extend(["--arg", arg])
+
+    for key, value in env.items():
+        argv.extend(["--env", f"{key}={value}"])
+
+    for host, guest in dirs:
+        argv.extend(["--dir", f"{os.fspath(host)}::{guest}"])
+
+    if os.environ.get("VERBOSE_ADAPTER"):
+        print(" ".join(shlex.quote(component) for component in argv))
+
+    return argv

test/run-testsuite.sh

@@ -12,9 +12,9 @@ if [ $# -gt 0 ]; then
 fi
 
 python3 "$TESTSUITE_ROOT/test-runner/wasi_test_runner.py"  \
-    --test-suite "$TESTSUITE_ROOT/tests/assemblyscript/testsuite/" \
-                 "$TESTSUITE_ROOT/tests/c/testsuite/" \
-                 "$TESTSUITE_ROOT/tests/rust/testsuite/" \
+    --test-suite "$TESTSUITE_ROOT/tests/assemblyscript/testsuite/wasm32-wasip1" \
+                 "$TESTSUITE_ROOT/tests/c/testsuite/wasm32-wasip1" \
+                 "$TESTSUITE_ROOT/tests/rust/testsuite/wasm32-wasip1" \
     --runtime-adapter "$TEST_DIR/adapters/$ADAPTER/adapter.py" \
     --exclude-filter "$TEST_DIR/skip.json" \
     $@

test/skip.json

@@ -1,13 +1,14 @@
 {
-  "WASI Assemblyscript tests": {
+  "WASI Assemblyscript  tests [wasm32-wasip1]": {
   },
-  "WASI C tests": {
+  "WASI C tests [wasm32-wasip1]": {
     "sock_shutdown-invalid_fd": "not implemented yet",
     "stat-dev-ino": "fail",
     "sock_shutdown-not_sock": "fail",
-    "fdopendir-with-access": "fail"
+    "fdopendir-with-access": "fail",
+    "pwrite-with-append": "fail"
   },
-  "WASI Rust tests": {
+  "WASI Rust tests [wasm32-wasip1]": {
     "path_exists": "fail",
     "fd_filestat_set": "fail",
     "symlink_create": "fail",
@@ -24,6 +25,7 @@
     "nofollow_errors": "fail",
     "path_open_preopen": "fail",
     "symlink_filestat": "fail",
-    "symlink_loop": "fail"
+    "symlink_loop": "fail",
+    "fstflags_validate": "fail"
   }
 }