Skip to content

Commit 0d0d1b2

Browse files
committed
Add truffle runtime distributions to wasm dependencies.
1 parent 1b64928 commit 0d0d1b2

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

wasm/mx.wasm/mx_wasm.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,12 @@ def apply(self, config):
187187
mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.wasm/*=com.oracle.truffle.wasm.debugtests']
188188
return (vmArgs, mainClass, mainClassArgs)
189189

190+
def processDeps(self, deps):
191+
super().processDeps(deps)
192+
truffle_runtime_dist_names = mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=True, use_enterprise=True)
193+
mx.logv(f"Adding Truffle runtime distributions {', '.join(truffle_runtime_dist_names)} to unittest dependencies.")
194+
deps.update((mx.distribution(d) for d in truffle_runtime_dist_names))
195+
190196

191197
mx_unittest.register_unittest_config(WasmUnittestConfig())
192198

@@ -658,7 +664,7 @@ def wasm(args, **kwargs):
658664
mx_truffle.enable_sun_misc_unsafe(vmArgs)
659665

660666
path_args = mx.get_runtime_jvm_args([
661-
"TRUFFLE_API",
667+
*mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=True, use_enterprise=True),
662668
"WASM",
663669
"WASM_LAUNCHER",
664670
] + (['tools:CHROMEINSPECTOR', 'tools:TRUFFLE_PROFILER', 'tools:INSIGHT'] if mx.suite('tools', fatalIfMissing=False) is not None else []))

0 commit comments

Comments
 (0)