RFR: 8210515: [TESTBUG]CheckArchivedModuleApp.java needs to check if EnableJVMCI is set

[Ioi Lam]

Hi Jiangli,

I found it very difficult to understand what's going on here:


   51         // -XX:+EnableJVMCI adds extra system modules
   52         boolean noAddedModule = !wb.getBooleanVMFlag("EnableJVMCI");
   53         boolean expectArchivedDescriptors = "yes".equals(args[0]) 
&& noAddedModule;
   54         boolean expectArchivedConfiguration = 
"yes".equals(args[1]) && noAddedModule;

Do you mean this?

boolean expectArchivedDescriptors = "yes".equals(args[0]);
boolean expectArchivedConfiguration = "yes".equals(args[1]);
if (wb.getBooleanVMFlag("EnableJVMCI")) {
    // When -XX:+EnableJVMCI is used, extra modules are added. As a 
result, the system module
    // objects are not archived
     expectArchivedDescriptors = false;
     expectArchivedConfiguration = false;
}

Thanks
- Ioi

On 9/8/18 12:32 PM, Jiangli Zhou wrote:
> Please review this simple test fix for CheckArchivedModuleApp.java.
>
>   webrev: http://cr.openjdk.java.net/~jiangli/8210515/webrev.00/
>
>   bug: https://bugs.openjdk.java.net/browse/JDK-8210515?filter=14921
>
> Extra system modules are used with -XX:+EnableJVMCI. Currently, system 
> module objects are only archived for the default set of boot layer 
> modules. Module object archiving is disabled for all other 
> configurations. CheckArchivedModuleApp.java needs to check if 
> EnableJVMCI is set in the current execution mode and adjust the 
> exception (whether module objects are archived or not). 
> ArchivedModuleComboTest.java uses CheckArchivedModuleApp and now 
> passes with -XX:+EnableJVMCI.
>
> Removed both ArchivedModuleCompareTest.java and 
> ArchivedModuleComboTest.java from ProblemList-graal.txt. The separate 
> issue for ArchivedModuleCompareTest.java was already fixed earlier.
>
> Tested tier1 - teir6.
>
> Thanks,
>
> Jiangli
>