Skip to content

Commit d223a21

Browse files
Skip packaging tests and do not try to load core modules when CM enabled
1 parent fbac87d commit d223a21

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ import { WASI } from "wasi";
44
import { RubyVM } from "../src/index";
55
import * as preview2Shim from "@bytecodealliance/preview2-shim"
66

7-
const rubyModule = (async () => {
7+
const memoize = (fn) => {
8+
let result;
9+
return async () => {
10+
if (!result) {
11+
result = await fn();
12+
}
13+
return result;
14+
};
15+
};
16+
17+
const getRubyModule = memoize(async () => {
818
let binaryPath;
919
if (process.env.RUBY_ROOT) {
1020
binaryPath = path.join(process.env.RUBY_ROOT, "./usr/local/bin/ruby");
@@ -18,7 +28,7 @@ const rubyModule = (async () => {
1828
}
1929
const binary = await fs.readFile(binaryPath);
2030
return await WebAssembly.compile(binary.buffer);
21-
})();
31+
});
2232

2333
const initModuleRubyVM = async ({ suppressStderr } = { suppressStderr: false }) => {
2434
let preopens = {};
@@ -38,7 +48,7 @@ const initModuleRubyVM = async ({ suppressStderr } = { suppressStderr: false })
3848
preopens,
3949
});
4050

41-
const module = await rubyModule;
51+
const module = await getRubyModule();
4252
const { vm } = await RubyVM.instantiateModule({ module, wasip1: wasi })
4353
return vm;
4454
};

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ const initRubyVM = async (rubyModule, args) => {
3232
};
3333

3434
describe("Packaging validation", () => {
35-
if (!process.env.RUBY_NPM_PACKAGE_ROOT) {
35+
if (
36+
!process.env.RUBY_NPM_PACKAGE_ROOT ||
37+
(process.env.ENABLE_COMPONENT_TESTS && process.env.ENABLE_COMPONENT_TESTS !== 'false')
38+
) {
3639
test.skip("skip", () => {});
3740
return;
3841
}

0 commit comments

Comments
 (0)