Skip to content

Fix mx unittest launch for configure tests #13193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oleksii-tumanov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix mx unittest launch for configure tests #13193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions substratevm/mx.substratevm/mx_substratevm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3012,14 +3012,35 @@ def apply(self, config):
# VMAccess needs to access jdk.internal.module.Modules
vmArgs.extend(['--add-exports=java.base/jdk.internal.module=jdk.graal.compiler.vmaccess'])

# JVMCI is dynamically exported to Graal when JVMCI is initialized. This is too late
# for the junit harness which uses reflection to find @Test methods. In addition, the
# tests widely use JVMCI classes so JVMCI needs to also export all its packages to
# ALL-UNNAMED.
# Configure tests may run before JVMCI applies its dynamic exports, so export these
# packages eagerly.
mainClassArgs.extend(['-JUnitOpenPackages', 'jdk.internal.vm.ci/*=jdk.graal.compiler,ALL-UNNAMED'])
mainClassArgs.extend(['-JUnitOpenPackages', 'org.graalvm.nativeimage/*=ALL-UNNAMED'])

return (vmArgs, mainClass, mainClassArgs)


mx_unittest.register_unittest_config(StandalonePointstoUnittestsConfig())


class SvmUnittestConfig(mx_compiler.GraalUnittestConfig):

def __init__(self):
super(SvmUnittestConfig, self).__init__('svm-unittest')

def apply(self, config):
vmArgs, mainClass, mainClassArgs = super(SvmUnittestConfig, self).apply(config)

# SubstrateVM configure tests can initialize pointsto classes before JVMCI has performed
# its dynamic exports, so they need these JVMCI packages exported eagerly.
vmArgs.extend([
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED',
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta.annotation=ALL-UNNAMED',
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta.annotation=jdk.graal.compiler.vmaccess',
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED',
])

return (vmArgs, mainClass, mainClassArgs)


mx_unittest.register_unittest_config(SvmUnittestConfig())
1 change: 1 addition & 0 deletions substratevm/mx.substratevm/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2723,6 +2723,7 @@
"SVM",
"SVM_CONFIGURE",
],
"unittestConfig" : "svm-unittest",
"testDistribution" : True,
},

Expand Down