Skip to content

Commit 0514146

Browse files
Add missing configuration for native-unit and unit tests.
1 parent 1c9f311 commit 0514146

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

substratevm/mx.substratevm/mx_substratevm.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,9 @@ def run_nic_conditional_config_test(agent_path, conditional_config_filter_path):
628628
'experimental-conditional-config-part']
629629
jvm_unittest(['-agentpath:' + agent_path + '=' + ','.join(agent_opts),
630630
'-Dcom.oracle.svm.configure.test.conditionalconfig.PartialConfigurationGenerator.enabled=true',
631+
'--add-exports=jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED',
632+
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED',
633+
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED',
631634
'com.oracle.svm.configure.test.conditionalconfig.PartialConfigurationGenerator#' + test_case])
632635
config_output_dir = join(nic_test_dir, 'config-output')
633636
nic_exe = mx.cmd_suffix(join(mx.JDKConfig(home=mx_sdk_vm_impl.graalvm_output()).home, 'bin', 'native-image-configure'))
@@ -640,6 +643,9 @@ def run_nic_conditional_config_test(agent_path, conditional_config_filter_path):
640643
jvm_unittest(
641644
['-Dcom.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier.configpath=' + config_output_dir,
642645
"-Dcom.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier.enabled=true",
646+
'--add-exports=jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED',
647+
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED',
648+
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED',
643649
'com.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier'])
644650

645651

@@ -654,10 +660,16 @@ def run_agent_conditional_config_test(agent_path, conditional_config_filter_path
654660
# This run generates the configuration from different test cases
655661
jvm_unittest(['-agentpath:' + agent_path + '=' + ','.join(agent_opts),
656662
'-Dcom.oracle.svm.configure.test.conditionalconfig.ConfigurationGenerator.enabled=true',
663+
'--add-exports=jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED',
664+
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED',
665+
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED',
657666
'com.oracle.svm.configure.test.conditionalconfig.ConfigurationGenerator'])
658667
# This run verifies that the generated configuration matches the expected one
659668
jvm_unittest(['-Dcom.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier.configpath=' + config_dir,
660-
"-Dcom.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier.enabled=true",
669+
'-Dcom.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier.enabled=true',
670+
'--add-exports=jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED',
671+
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED',
672+
'--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED',
661673
'com.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier'])
662674

663675

0 commit comments

Comments
 (0)