8210515: [TESTBUG]CheckArchivedModuleApp.java needs to check if EnableJVMCI is set
System module objects are not archived when EnableJVMCI is set to true. Reviewed-by: iklam, ccheung
This commit is contained in:
parent
2702b5c299
commit
4baa5b10d1
test/hotspot/jtreg
@ -147,9 +147,6 @@ vmTestbase/nsk/jvmti/StopThread/stopthrd007/TestDescription.java
|
||||
|
||||
vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/TestDescription.java 8051349 generic-all
|
||||
|
||||
runtime/appcds/cacheObject/ArchivedModuleCompareTest.java 8209534 generic-all
|
||||
runtime/appcds/cacheObject/ArchivedModuleComboTest.java 8209534 generic-all
|
||||
|
||||
serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java 8202482 generic-all
|
||||
|
||||
compiler/stable/TestStableBoolean.java 8204347 generic-all
|
||||
|
@ -47,8 +47,16 @@ public class CheckArchivedModuleApp {
|
||||
throw new RuntimeException(
|
||||
"FAILED. Incorrect argument length: " + args.length);
|
||||
}
|
||||
|
||||
boolean expectArchivedDescriptors = "yes".equals(args[0]);
|
||||
boolean expectArchivedConfiguration = "yes".equals(args[1]);
|
||||
// -XX:+EnableJVMCI adds extra system modules, in which case the system
|
||||
// module objects are not archived.
|
||||
if (wb.getBooleanVMFlag("EnableJVMCI")) {
|
||||
expectArchivedDescriptors = false;
|
||||
expectArchivedConfiguration = false;
|
||||
}
|
||||
|
||||
checkModuleDescriptors(expectArchivedDescriptors);
|
||||
checkConfiguration(expectArchivedConfiguration);
|
||||
checkEmptyConfiguration(expectArchivedConfiguration);
|
||||
|
Loading…
x
Reference in New Issue
Block a user