2 files changed, 96 insertions, 98 deletions
diff --git a/std/wasi/snapshot_preview1_test.ts b/std/wasi/snapshot_preview1_test.ts
index aaffb3e20..12829b475 100644
--- a/std/wasi/snapshot_preview1_test.ts
+++ b/std/wasi/snapshot_preview1_test.ts
@@ -3,7 +3,6 @@
 import { assert, assertEquals } from "../testing/asserts.ts";
 import { copy } from "../fs/mod.ts";
 import * as path from "../path/mod.ts";
-import Context from "./snapshot_preview1.ts";
 
 const ignore = [
   "wasi_clock_time_get_realtime.wasm",
@@ -18,105 +17,84 @@ if (Deno.build.os == "windows") {
   ignore.push("std_fs_read_dir_relative.wasm");
 }
 
-if (import.meta.main) {
-  const options = JSON.parse(Deno.args[0]);
-  const pathname = Deno.args[1];
-  const binary = await Deno.readFile(pathname);
-  const module = await WebAssembly.compile(binary);
+const rootdir = path.dirname(path.fromFileUrl(import.meta.url));
+const testdir = path.join(rootdir, "testdata");
 
-  const context = new Context({
-    env: options.env,
-    args: [pathname].concat(options.args),
-    preopens: options.preopens,
-  });
+for await (const entry of Deno.readDir(testdir)) {
+  if (!entry.name.endsWith(".wasm")) {
+    continue;
+  }
 
-  const instance = new WebAssembly.Instance(module, {
-    wasi_snapshot_preview1: context.exports,
-  });
+  Deno.test({
+    name: entry.name,
+    ignore: ignore.includes(entry.name),
+    fn: async function () {
+      const basename = entry.name.replace(/\.wasm$/, ".json");
+      const prelude = await Deno.readTextFile(
+        path.resolve(testdir, basename),
+      );
+      const options = JSON.parse(prelude);
+
+      const workdir = await Deno.makeTempDir();
+      await copy(
+        path.join(testdir, "fixtures"),
+        path.join(workdir, "fixtures"),
+      );
+
+      try {
+        const process = await Deno.run({
+          cwd: workdir,
+          cmd: [
+            `${Deno.execPath()}`,
+            "run",
+            "--quiet",
+            "--unstable",
+            "--allow-all",
+            path.resolve(rootdir, "snapshot_preview1_test_runner.ts"),
+            prelude,
+            path.resolve(testdir, entry.name),
+          ],
+          stdin: "piped",
+          stdout: "piped",
+          stderr: "piped",
+        });
+
+        if (options.stdin) {
+          const stdin = new TextEncoder().encode(options.stdin);
+          await Deno.writeAll(process.stdin, stdin);
+        }
 
-  context.memory = instance.exports.memory;
-
-  instance.exports._start();
-} else {
-  const rootdir = path.dirname(path.fromFileUrl(import.meta.url));
-  const testdir = path.join(rootdir, "testdata");
-
-  for await (const entry of Deno.readDir(testdir)) {
-    if (!entry.name.endsWith(".wasm")) {
-      continue;
-    }
-
-    Deno.test({
-      name: entry.name,
-      ignore: ignore.includes(entry.name),
-      fn: async function () {
-        const basename = entry.name.replace(/\.wasm$/, ".json");
-        const prelude = await Deno.readTextFile(
-          path.resolve(testdir, basename),
-        );
-        const options = JSON.parse(prelude);
-
-        const workdir = await Deno.makeTempDir();
-        await copy(
-          path.join(testdir, "fixtures"),
-          path.join(workdir, "fixtures"),
-        );
-
-        try {
-          const process = await Deno.run({
-            cwd: workdir,
-            cmd: [
-              `${Deno.execPath()}`,
-              "run",
-              "--quiet",
-              "--unstable",
-              "--allow-all",
-              import.meta.url,
-              prelude,
-              path.resolve(testdir, entry.name),
-            ],
-            stdin: "piped",
-            stdout: "piped",
-            stderr: "piped",
-          });
-
-          if (options.stdin) {
-            const stdin = new TextEncoder().encode(options.stdin);
-            await Deno.writeAll(process.stdin, stdin);
-          }
-
-          process.stdin.close();
-
-          const stdout = await Deno.readAll(process.stdout);
-
-          if (options.stdout) {
-            assertEquals(new TextDecoder().decode(stdout), options.stdout);
-          } else {
-            await Deno.writeAll(Deno.stdout, stdout);
-          }
-
-          process.stdout.close();
-
-          const stderr = await Deno.readAll(process.stderr);
-
-          if (options.stderr) {
-            assertEquals(new TextDecoder().decode(stderr), options.stderr);
-          } else {
-            await Deno.writeAll(Deno.stderr, stderr);
-          }
-
-          process.stderr.close();
-
-          const status = await process.status();
-          assertEquals(status.code, options.exitCode ? +options.exitCode : 0);
-
-          process.close();
-        } catch (err) {
-          throw err;
-        } finally {
-          await Deno.remove(workdir, { recursive: true });
+        process.stdin.close();
+
+        const stdout = await Deno.readAll(process.stdout);
+
+        if (options.stdout) {
+          assertEquals(new TextDecoder().decode(stdout), options.stdout);
+        } else {
+          await Deno.writeAll(Deno.stdout, stdout);
         }
-      },
-    });
-  }
+
+        process.stdout.close();
+
+        const stderr = await Deno.readAll(process.stderr);
+
+        if (options.stderr) {
+          assertEquals(new TextDecoder().decode(stderr), options.stderr);
+        } else {
+          await Deno.writeAll(Deno.stderr, stderr);
+        }
+
+        process.stderr.close();
+
+        const status = await process.status();
+        assertEquals(status.code, options.exitCode ? +options.exitCode : 0);
+
+        process.close();
+      } catch (err) {
+        throw err;
+      } finally {
+        await Deno.remove(workdir, { recursive: true });
+      }
+    },
+  });
 }
diff --git a/std/wasi/snapshot_preview1_test_runner.ts b/std/wasi/snapshot_preview1_test_runner.ts
new file mode 100644
index 000000000..fb29f082e
--- /dev/null
+++ b/std/wasi/snapshot_preview1_test_runner.ts
@@ -0,0 +1,20 @@
+import Context from "./snapshot_preview1.ts";
+
+const options = JSON.parse(Deno.args[0]);
+const pathname = Deno.args[1];
+const binary = await Deno.readFile(pathname);
+const module = await WebAssembly.compile(binary);
+
+const context = new Context({
+  env: options.env,
+  args: [pathname].concat(options.args),
+  preopens: options.preopens,
+});
+
+const instance = new WebAssembly.Instance(module, {
+  wasi_snapshot_preview1: context.exports,
+});
+
+context.memory = instance.exports.memory;
+
+instance.exports._start();