Skip to content

Commit a777f55

Browse files
committed
Use -JUnitOpenPackages to open GraalWasm for unit tests
1 parent eb23711 commit a777f55

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

wasm/mx.wasm/mx_wasm.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@ def apply(self, config):
181181
# limit heap memory to 4G, unless otherwise specified
182182
if not any(a.startswith('-Xm') for a in vmArgs):
183183
vmArgs += ['-Xmx4g']
184+
# Export GraalWasm implementation to JUnit test runner
185+
mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.wasm/*=org.graalvm.wasm.test']
186+
mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.wasm/*=com.oracle.truffle.wasm.closedtestcases']
187+
mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.wasm/*=com.oracle.truffle.wasm.debugtests']
184188
return (vmArgs, mainClass, mainClassArgs)
185189

186190

wasm/mx.wasm/suite.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,6 @@
295295
"org.graalvm.collections",
296296
"static jdk.incubator.vector", # Vector API
297297
],
298-
"exports" : [
299-
"* to org.graalvm.wasm.test",
300-
# Export internals to official test runner
301-
"* to com.oracle.truffle.wasm.closedtestcases",
302-
# Export internals to debug tests
303-
"* to com.oracle.truffle.wasm.debugtests",
304-
]
305298
},
306299
"subDir" : "src",
307300
"dependencies" : [

0 commit comments

Comments
 (0)