Test each channel specific binaries through RUBY_NPM_PACKAGE_ROOT

Author: kateinoigakukun

packages/npm-packages/ruby-3_2-wasm-wasi/package.json

@@ -11,7 +11,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "cd ../ruby-wasm-wasi && npm test",
+    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-3_2-wasm-wasi npm -C ../ruby-wasm-wasi test",
     "build:deps": "cd ../ruby-wasm-wasi && npm run build",
     "build:static": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
     "build:rollup": "rollup -c rollup.config.mjs",

packages/npm-packages/ruby-head-wasm-wasi/package.json

@@ -11,7 +11,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "cd ../ruby-wasm-wasi && npm test",
+    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi npm -C ../ruby-wasm-wasi test",
     "build:deps": "cd ../ruby-wasm-wasi && npm run build",
     "build:static": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
     "build:rollup": "rollup -c rollup.config.mjs",

packages/npm-packages/ruby-wasm-wasi/test/init.ts

@@ -7,8 +7,13 @@ const rubyModule = (async () => {
   let binaryPath;
   if (process.env.RUBY_ROOT) {
     binaryPath = path.join(process.env.RUBY_ROOT, "./usr/local/bin/ruby");
+  } else if (process.env.RUBY_NPM_PACKAGE_ROOT) {
+    binaryPath = path.join(
+      process.env.RUBY_NPM_PACKAGE_ROOT,
+      "./dist/ruby.debug+stdlib.wasm"
+    );
   } else {
-    binaryPath = path.join(__dirname, "./../dist/ruby.debug+stdlib.wasm");
+    throw new Error("RUBY_ROOT or RUBY_NPM_PACKAGE_ROOT must be set");
   }
   const binary = await fs.readFile(binaryPath);
   return await WebAssembly.compile(binary.buffer);

packages/npm-packages/ruby-wasm-wasi/test/package.test.ts

@@ -29,13 +29,18 @@ const initRubyVM = async (rubyModule: WebAssembly.Module, args: string[]) => {
 
 describe("Packaging validation", () => {
   jest.setTimeout(20 /*sec*/ * 1000);
+  if (!process.env.RUBY_NPM_PACKAGE_ROOT) {
+    return;
+  }
 
   const moduleCache = new Map<string, WebAssembly.Module>();
   const loadWasmModule = async (file: string) => {
     if (moduleCache.has(file)) {
       return moduleCache.get(file)!;
     }
-    const binary = await fs.readFile(path.join(__dirname, `./../dist/${file}`));
+    const binary = await fs.readFile(
+      path.join(process.env.RUBY_NPM_PACKAGE_ROOT, `./dist/${file}`)
+    );
     const mod = await WebAssembly.compile(binary.buffer);
     moduleCache.set(file, mod);
     return mod;

packages/npm-packages/ruby-wasm-wasi/tools/run-test-unit.mjs

@@ -7,18 +7,24 @@ import path from "path";
 import * as nodeWasi from "wasi";
 import { RubyVM } from "../dist/index.cjs.js";
 
-const instantiateNodeWasi = async (rootTestFile) => {
-  const dirname = path.dirname(new URL(import.meta.url).pathname);
+const deriveRubySetup = () => {
+  let preopens = {}
   let binaryPath;
-  let preopens = {
-    __root__: path.join(dirname, ".."),
-  };
   if (process.env.RUBY_ROOT) {
     binaryPath = path.join(process.env.RUBY_ROOT, "./usr/local/bin/ruby");
     preopens["/usr"] = path.join(process.env.RUBY_ROOT, "./usr");
+  } else if (process.env.RUBY_NPM_PACKAGE_ROOT) {
+    binaryPath = path.join(process.env.RUBY_NPM_PACKAGE_ROOT, "./dist/ruby.debug+stdlib.wasm");
   } else {
-    binaryPath = path.join(dirname, "../dist/ruby.debug+stdlib.wasm");
+    throw new Error("RUBY_ROOT or RUBY_NPM_PACKAGE_ROOT must be set");
   }
+  return { binaryPath, preopens };
+}
+
+const instantiateNodeWasi = async (rootTestFile) => {
+  const dirname = path.dirname(new URL(import.meta.url).pathname);
+  const { binaryPath, preopens } = deriveRubySetup();
+  preopens["__root__"] = path.join(dirname, "..");
   const binary = await fs.readFile(binaryPath);
   const rubyModule = await WebAssembly.compile(binary);
   const wasi = new nodeWasi.WASI({
@@ -81,11 +87,10 @@ const instantiateWasmerWasi = async (rootTestFile) => {
 
   const dirname = path.dirname(new URL(import.meta.url).pathname);
   await loadToMemFs('/__root__/test', path.join(dirname, '../test'));
-  const preopens = {
-    __root__: '/__root__',
-  };
 
-  const binaryPath = path.join(dirname, "../dist/ruby+stdlib.wasm");
+  const { binaryPath, preopens } = deriveRubySetup();
+  preopens["__root__"] = '/__root__';
+
   if (process.env.RUBY_ROOT) {
     console.error('For now, testing with RUBY_ROOT is not supported.');
   }