@@ -628,6 +628,9 @@ def run_nic_conditional_config_test(agent_path, conditional_config_filter_path):
628
628
'experimental-conditional-config-part' ]
629
629
jvm_unittest (['-agentpath:' + agent_path + '=' + ',' .join (agent_opts ),
630
630
'-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' ,
631
634
'com.oracle.svm.configure.test.conditionalconfig.PartialConfigurationGenerator#' + test_case ])
632
635
config_output_dir = join (nic_test_dir , 'config-output' )
633
636
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):
640
643
jvm_unittest (
641
644
['-Dcom.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier.configpath=' + config_output_dir ,
642
645
"-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' ,
643
649
'com.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier' ])
644
650
645
651
@@ -654,10 +660,16 @@ def run_agent_conditional_config_test(agent_path, conditional_config_filter_path
654
660
# This run generates the configuration from different test cases
655
661
jvm_unittest (['-agentpath:' + agent_path + '=' + ',' .join (agent_opts ),
656
662
'-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' ,
657
666
'com.oracle.svm.configure.test.conditionalconfig.ConfigurationGenerator' ])
658
667
# This run verifies that the generated configuration matches the expected one
659
668
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' ,
661
673
'com.oracle.svm.configure.test.conditionalconfig.ConfigurationVerifier' ])
662
674
663
675
0 commit comments